diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-08-14 00:09:21 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-08-14 00:09:21 +0000 |
| commit | d5eacb5734e0c552e291464e19218257c65e3330 (patch) | |
| tree | 9d040b21f2f3fc7d6c10357666727d076f7315cd /libstdc++-v3 | |
| parent | c59b06cc0ec7573c417a7a6e39df1ca9591156e6 (diff) | |
| download | gcc-d5eacb5734e0c552e291464e19218257c65e3330.tar.gz | |
2010-08-13 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/45281
* include/bits/stl_queue.h (queue(queue&&), operator=(queue&&),
priority_queue(priority_queue&&), operator=(priority_queue&&)):
Remove, per CH 15.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@163231 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_queue.h | 23 |
2 files changed, 8 insertions, 22 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 16bbcc9a493..f5c99a7f4bf 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,12 @@ 2010-08-13 Paolo Carlini <paolo.carlini@oracle.com> + PR libstdc++/45281 + * include/bits/stl_queue.h (queue(queue&&), operator=(queue&&), + priority_queue(priority_queue&&), operator=(priority_queue&&)): + Remove, per CH 15. + +2010-08-13 Paolo Carlini <paolo.carlini@oracle.com> + * testsuite/23_containers/unordered_map/dr1189.cc: Move to... * testsuite/23_containers/unordered_map/hash_policy/dr1189.cc: ... here. diff --git a/libstdc++-v3/include/bits/stl_queue.h b/libstdc++-v3/include/bits/stl_queue.h index 058f1b65d27..96e29ed636e 100644 --- a/libstdc++-v3/include/bits/stl_queue.h +++ b/libstdc++-v3/include/bits/stl_queue.h @@ -1,6 +1,6 @@ // Queue implementation -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -137,16 +137,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) explicit queue(_Sequence&& __c = _Sequence()) : c(std::move(__c)) { } - - queue(queue&& __q) - : c(std::move(__q.c)) { } - - queue& - operator=(queue&& __q) - { - c = std::move(__q.c); - return *this; - } #endif /** @@ -451,17 +441,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) c.insert(c.end(), __first, __last); std::make_heap(c.begin(), c.end(), comp); } - - priority_queue(priority_queue&& __pq) - : c(std::move(__pq.c)), comp(std::move(__pq.comp)) { } - - priority_queue& - operator=(priority_queue&& __pq) - { - c = std::move(__pq.c); - comp = std::move(__pq.comp); - return *this; - } #endif /** |