]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
set.h: Revert last change, per DR 1204 [Ready]; mention the latter in comment.
authorPaolo Carlini <paolo.carlini@oracle.com>
Sat, 9 Jan 2010 11:16:42 +0000 (11:16 +0000)
committerPaolo Carlini <paolo@gcc.gnu.org>
Sat, 9 Jan 2010 11:16:42 +0000 (11:16 +0000)
2010-01-09  Paolo Carlini  <paolo.carlini@oracle.com>

* include/debug/set.h: Revert last change, per DR 1204 [Ready];
mention the latter in comment.
* include/debug/unordered_map: Likewise.
  * include/debug/multiset.h: Likewise.
  * include/debug/vector: Likewise.
* include/debug/unordered_set: Likewise.
* include/debug/deque: Likewise.
* include/debug/map.h: Likewise.
* include/debug/list: Likewise.
* include/debug/multimap.h: Likewise.
* include/tr1_impl/unordered_map: Likewise.
* include/tr1_impl/unordered_set: Likewise.
* include/profile/set.h: Likewise.
* include/profile/unordered_map: Likewise.
* include/profile/multiset.h: Likewise.
* include/profile/unordered_set: Likewise.
* include/profile/vector: Likewise.
* include/profile/deque: Likewise.
* include/profile/map.h: Likewise.
* include/profile/list: Likewise.
* include/profile/multimap.h: Likewise.
* include/ext/vstring.h: Likewise.
* include/bits/stl_list.h: Likewise.
* include/bits/stl_map.h: Likewise.
* include/bits/stl_set.h: Likewise.
* include/bits/stl_multimap.h: Likewise.
* include/bits/stl_vector.h: Likewise.
* include/bits/stl_deque.h: Likewise.
* include/bits/stl_multiset.h: Likewise.

* include/bits/forward_list.h: Remove pre-existing check.
* include/ext/vstring.h: Likewise.

* testsuite/ext/vstring/cons/self_move_assign.cc: Remove.
* testsuite/23_containers/unordered_map/cons/self_move_assign.cc:
Likewise.
* testsuite/23_containers/multimap/cons/self_move_assign.cc: Likewise.
* testsuite/23_containers/set/cons/self_move_assign.cc: Likewise.
* testsuite/23_containers/unordered_multimap/cons/
self_move_assign.cc: Likewise.
* testsuite/23_containers/forward_list/cons/self_move_assign.cc:
Likewise.
* testsuite/23_containers/unordered_set/cons/self_move_assign.cc:
Likewise.
  * testsuite/23_containers/vector/cons/self_move_assign.cc: Likewise.
* testsuite/23_containers/deque/cons/self_move_assign.cc: Likewise.
* testsuite/23_containers/multiset/cons/self_move_assign.cc: Likewise.
* testsuite/23_containers/list/cons/self_move_assign.cc: Likewise.
* testsuite/23_containers/unordered_multiset/cons/
self_move_assign.cc: Likewise.
* testsuite/23_containers/map/cons/self_move_assign.cc: Likewise.

* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
Adjust dg-error line numbers.
  * testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
Likewise.
  * testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Likewise.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Likewise.

From-SVN: r155756

60 files changed:
libstdc++-v3/ChangeLog
libstdc++-v3/include/bits/forward_list.h
libstdc++-v3/include/bits/stl_bvector.h
libstdc++-v3/include/bits/stl_deque.h
libstdc++-v3/include/bits/stl_list.h
libstdc++-v3/include/bits/stl_map.h
libstdc++-v3/include/bits/stl_multimap.h
libstdc++-v3/include/bits/stl_multiset.h
libstdc++-v3/include/bits/stl_set.h
libstdc++-v3/include/bits/stl_vector.h
libstdc++-v3/include/debug/deque
libstdc++-v3/include/debug/list
libstdc++-v3/include/debug/map.h
libstdc++-v3/include/debug/multimap.h
libstdc++-v3/include/debug/multiset.h
libstdc++-v3/include/debug/set.h
libstdc++-v3/include/debug/unordered_map
libstdc++-v3/include/debug/unordered_set
libstdc++-v3/include/debug/vector
libstdc++-v3/include/ext/vstring.h
libstdc++-v3/include/profile/deque
libstdc++-v3/include/profile/list
libstdc++-v3/include/profile/map.h
libstdc++-v3/include/profile/multimap.h
libstdc++-v3/include/profile/multiset.h
libstdc++-v3/include/profile/set.h
libstdc++-v3/include/profile/unordered_map
libstdc++-v3/include/profile/unordered_set
libstdc++-v3/include/profile/vector
libstdc++-v3/include/tr1_impl/unordered_map
libstdc++-v3/include/tr1_impl/unordered_set
libstdc++-v3/testsuite/23_containers/deque/cons/self_move_assign.cc [deleted file]
libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/assign_neg.cc
libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc
libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc
libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/insert_neg.cc
libstdc++-v3/testsuite/23_containers/forward_list/cons/self_move_assign.cc [deleted file]
libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/assign_neg.cc
libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/constructor_1_neg.cc
libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/constructor_2_neg.cc
libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/insert_neg.cc
libstdc++-v3/testsuite/23_containers/list/cons/self_move_assign.cc [deleted file]
libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc
libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc
libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc
libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc
libstdc++-v3/testsuite/23_containers/map/cons/self_move_assign.cc [deleted file]
libstdc++-v3/testsuite/23_containers/multimap/cons/self_move_assign.cc [deleted file]
libstdc++-v3/testsuite/23_containers/multiset/cons/self_move_assign.cc [deleted file]
libstdc++-v3/testsuite/23_containers/set/cons/self_move_assign.cc [deleted file]
libstdc++-v3/testsuite/23_containers/unordered_map/cons/self_move_assign.cc [deleted file]
libstdc++-v3/testsuite/23_containers/unordered_multimap/cons/self_move_assign.cc [deleted file]
libstdc++-v3/testsuite/23_containers/unordered_multiset/cons/self_move_assign.cc [deleted file]
libstdc++-v3/testsuite/23_containers/unordered_set/cons/self_move_assign.cc [deleted file]
libstdc++-v3/testsuite/23_containers/vector/cons/self_move_assign.cc [deleted file]
libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc
libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc
libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc
libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc
libstdc++-v3/testsuite/ext/vstring/cons/self_move_assign.cc [deleted file]

index fe5de4369712e92636d55ed4737b352969e25d03..a8276a32413309cf9ed340f5266b780d2107becb 100644 (file)
@@ -1,3 +1,90 @@
+2010-01-09  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * include/debug/set.h: Revert last change, per DR 1204 [Ready];
+       mention the latter in comment.
+       * include/debug/unordered_map: Likewise.
+       * include/debug/multiset.h: Likewise.
+       * include/debug/vector: Likewise.
+       * include/debug/unordered_set: Likewise.
+       * include/debug/deque: Likewise.
+       * include/debug/map.h: Likewise.
+       * include/debug/list: Likewise.
+       * include/debug/multimap.h: Likewise.
+       * include/tr1_impl/unordered_map: Likewise.
+       * include/tr1_impl/unordered_set: Likewise.
+       * include/profile/set.h: Likewise.
+       * include/profile/unordered_map: Likewise.
+       * include/profile/multiset.h: Likewise.
+       * include/profile/unordered_set: Likewise.
+       * include/profile/vector: Likewise.
+       * include/profile/deque: Likewise.
+       * include/profile/map.h: Likewise.
+       * include/profile/list: Likewise.
+       * include/profile/multimap.h: Likewise.
+       * include/ext/vstring.h: Likewise.
+       * include/bits/stl_list.h: Likewise.
+       * include/bits/stl_map.h: Likewise.
+       * include/bits/stl_set.h: Likewise.
+       * include/bits/stl_multimap.h: Likewise.
+       * include/bits/stl_vector.h: Likewise.
+       * include/bits/stl_deque.h: Likewise.
+       * include/bits/stl_multiset.h: Likewise.
+
+       * include/bits/forward_list.h: Remove pre-existing check.
+       * include/ext/vstring.h: Likewise.
+
+       * testsuite/ext/vstring/cons/self_move_assign.cc: Remove.
+       * testsuite/23_containers/unordered_map/cons/self_move_assign.cc:
+       Likewise.
+       * testsuite/23_containers/multimap/cons/self_move_assign.cc: Likewise.
+       * testsuite/23_containers/set/cons/self_move_assign.cc: Likewise.
+       * testsuite/23_containers/unordered_multimap/cons/
+       self_move_assign.cc: Likewise.
+       * testsuite/23_containers/forward_list/cons/self_move_assign.cc:
+       Likewise.
+       * testsuite/23_containers/unordered_set/cons/self_move_assign.cc:
+       Likewise.
+       * testsuite/23_containers/vector/cons/self_move_assign.cc: Likewise.
+       * testsuite/23_containers/deque/cons/self_move_assign.cc: Likewise.
+       * testsuite/23_containers/multiset/cons/self_move_assign.cc: Likewise.
+       * testsuite/23_containers/list/cons/self_move_assign.cc: Likewise.
+       * testsuite/23_containers/unordered_multiset/cons/
+       self_move_assign.cc: Likewise.
+       * testsuite/23_containers/map/cons/self_move_assign.cc: Likewise.
+
+       * testsuite/23_containers/vector/requirements/dr438/assign_neg.cc:
+       Adjust dg-error line numbers.
+       * testsuite/23_containers/vector/requirements/dr438/insert_neg.cc:
+       Likewise.
+       * testsuite/23_containers/vector/requirements/dr438/
+       constructor_1_neg.cc: Likewise.
+       * testsuite/23_containers/vector/requirements/dr438/
+       constructor_2_neg.cc: Likewise.
+       * testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
+       Likewise.
+       * testsuite/23_containers/deque/requirements/dr438/insert_neg.cc:
+       Likewise.
+       * testsuite/23_containers/deque/requirements/dr438/
+       constructor_1_neg.cc: Likewise.
+       * testsuite/23_containers/forward_list/requirements/dr438/
+       assign_neg.cc: Likewise.
+       * testsuite/23_containers/forward_list/requirements/dr438/
+       insert_neg.cc: Likewise.
+       * testsuite/23_containers/forward_list/requirements/dr438/
+       constructor_1_neg.cc: Likewise.
+       * testsuite/23_containers/forward_list/requirements/dr438/
+       constructor_2_neg.cc: Likewise.
+       * testsuite/23_containers/deque/requirements/dr438/
+       constructor_2_neg.cc: Likewise.
+       * testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
+       Likewise.
+       * testsuite/23_containers/list/requirements/dr438/insert_neg.cc:
+       Likewise.
+       * testsuite/23_containers/list/requirements/dr438/
+       constructor_1_neg.cc: Likewise.
+       * testsuite/23_containers/list/requirements/dr438/
+       constructor_2_neg.cc: Likewise.
+
 2010-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
 
        * include/debug/set.h: Protect move assignment operator vs self
index 409c93e031c1fd59a412028b8aabef87452ab0e6..10af47e74e1382ae16bd8c27eefd46cfeda2c0bd 100644 (file)
@@ -554,12 +554,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       forward_list&
       operator=(forward_list&& __list)
       {
-        if (&__list != this)
-          {
-            this->clear();
-            this->swap(__list);
-          }
-        return *this;
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__list);
+       return *this;
       }
 
       /**
index 6227a1fe951df54e116c25357e1d326c744b2db9..cce04841aec062514a86b05f2eb344816e639d62 100644 (file)
@@ -565,6 +565,7 @@ template<typename _Alloc>
     vector&
     operator=(vector&& __x)
     {
+      // NB: DR 1204.
       // NB: DR 675.
       this->clear();
       this->swap(__x); 
index b0b2f4940d84cb585a169e53eec1129bf373558a..7e60b658b65cf02c10beba215d7cc1477ee0b472 100644 (file)
@@ -884,12 +884,10 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
       deque&
       operator=(deque&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         } 
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;
       }
 
index b6ce11382efe1965ed5670c1bbf50a65a4206a01..22a1bcb9625be061aee4f2c7ce02b88dc62c5b30 100644 (file)
@@ -606,12 +606,10 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
       list&
       operator=(list&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;
       }
 
index 33364bfe917fb75db68fd12d85342d8bcf3a82d0..a13eeb56fbbe7966d085457531817f49d361b298 100644 (file)
@@ -265,12 +265,10 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
       map&
       operator=(map&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         } 
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;
       }
 
index 0bff20a07355f371ed28fc6b1614428e49b2f50d..b582e38729a88e6500de518bf7906f1a8b94bb07 100644 (file)
@@ -262,12 +262,10 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
       multimap&
       operator=(multimap&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         } 
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;
       }
 
index bb84b6b7d08dc8736af599d118b5ebf82cab117e..dfbef1bb8234461d2e94402c45c100909f988eaf 100644 (file)
@@ -234,12 +234,10 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
       multiset&
       operator=(multiset&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;
       }
 
index 2388382ad316cca064fdac3f4108b25cd58d1895..3b0d86f93672076a055e8e018d7efb360e98d8c7 100644 (file)
@@ -241,13 +241,11 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
       set&
       operator=(set&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         } 
-       return *this;
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
+       return *this;
       }
 
       /**
index f681cf0e8554ec00adb0ac804343c77d4e1685f8..96fc86c5dc92edab23757e4ad0abb5c8e3ea53be 100644 (file)
@@ -335,12 +335,10 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
       vector&
       operator=(vector&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         } 
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;
       }
 
index 1c9535ec7568d7d0b9afa5b42bc1dcce9d7ee1c5..0c98006badb0fc7e0da09e197628ad60195c0588 100644 (file)
@@ -110,12 +110,10 @@ namespace __debug
       deque&
       operator=(deque&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           clear();
-           swap(__x);
-         }       
+       // NB: DR 1204.
+       // NB: DR 675.
+       clear();
+       swap(__x);
        return *this;
       }
 
index 78462e459059ff9fea178f35ed2d33de22de0cb2..36caee4eb56bf1df2ba969b982d77c5ae0bd2be1 100644 (file)
@@ -112,13 +112,11 @@ namespace __debug
       list&
       operator=(list&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           clear();
-           swap(__x);
-         }
-       return *this;
+       // NB: DR 1204.
+       // NB: DR 675.
+       clear();
+       swap(__x);
+       return *this;
       }
 
       list&
index 8ef28a19790ef9242841e5d59c28371a46e2f583..24f5ea6c06c3f50f51ecff14ce782bbb14599650 100644 (file)
@@ -115,12 +115,10 @@ namespace __debug
       map&
       operator=(map&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           clear();
-           swap(__x);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       clear();
+       swap(__x);
        return *this;
       }
 
index 4ef2990acd03dba91812d05b6ea8abcab1db982f..32a5429040672804b0176ad29b4a09bc9f361aef 100644 (file)
@@ -116,12 +116,10 @@ namespace __debug
       multimap&
       operator=(multimap&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           clear();
-           swap(__x);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       clear();
+       swap(__x);
        return *this;
       }
 
index 4a7ed9e66882aff605d06ba30d8a28b71c67810e..9f65ba34b282011a082d59934d401e0b97377530 100644 (file)
@@ -113,12 +113,10 @@ namespace __debug
       multiset&
       operator=(multiset&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           clear();
-           swap(__x);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       clear();
+       swap(__x);
        return *this;
       }
 
index 99f83fa9aa8db091f4f0cba61a44695143a52092..2bd3ddfa5dccb698858fea065c93e7d77d23b33e 100644 (file)
@@ -113,12 +113,10 @@ namespace __debug
       set&
       operator=(set&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           clear();
-           swap(__x);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       clear();
+       swap(__x);
        return *this;
       }
 
index 61a3a0a3686565c1465a2338c99d52367a8c9e5d..63b292b49f2d35e9c4d264b7c2a70c9880e8d3a0 100644 (file)
@@ -115,12 +115,10 @@ namespace __debug
       unordered_map&
       operator=(unordered_map&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           clear();
-           swap(__x);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       clear();
+       swap(__x);
        return *this;
       }
 
@@ -391,12 +389,10 @@ namespace __debug
       unordered_multimap&
       operator=(unordered_multimap&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           clear();
-           swap(__x);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       clear();
+       swap(__x);
        return *this;
       }
 
index f704f0167948b643935047ed33ef47d1daf9b0c6..d34b2816e7079379caad4f2f56142ab001f13a06 100644 (file)
@@ -115,12 +115,10 @@ namespace __debug
       unordered_set&
       operator=(unordered_set&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           clear();
-           swap(__x);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       clear();
+       swap(__x);
        return *this;
       }
 
@@ -389,6 +387,7 @@ namespace __debug
       unordered_multiset&
       operator=(unordered_multiset&& __x)
       {
+       // NB: DR 1204.
         // NB: DR 675.
        clear();
        swap(__x);
index 227905a513dec7de805c09e02c4833254a8eb45f..ca326e4194dfade42c89b02cd1add860d13cb2f7 100644 (file)
@@ -124,12 +124,10 @@ namespace __debug
       vector&
       operator=(vector&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           clear();
-           swap(__x);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       clear();
+       swap(__x);
        return *this;
       }
 
index 691915f5c7ffcb2252d68035ac0effa3d87f3688..bc3d829d8e159381633bf3dd07a5787a3cfa19d8 100644 (file)
@@ -260,11 +260,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       __versa_string&
       operator=(__versa_string&& __str)
       {
-       if (this != &__str)
-         {
-           this->clear();
-           this->swap(__str);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__str);
        return *this;
       }
 
index 12f45d646fcc8aa6716a5819441305935a186f7f..55e8d49d68674d5c481e8efebde0afbf1268a73b 100644 (file)
@@ -102,12 +102,10 @@ namespace __profile
       deque&
       operator=(deque&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         }  
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;
       }
 
index 9979a5211b2e84e77d0c7fa046f96cd63fcede66..09510a04205d1cf83b208421c3caaf1bc2957221 100644 (file)
@@ -102,12 +102,10 @@ namespace __profile
       list&
       operator=(list&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;
       }
 
index 6335ee774f345493c9900fa5e7dc1eed70a2dac0..fc698a9fa84c4182eae56375197920c7b9be1165 100644 (file)
@@ -121,12 +121,10 @@ namespace __profile
       map&
       operator=(map&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;
       }
 
index c240e331aa6ee34bbb7e8e04b62c2dc97e4faed1..d5627ad1d0a0402b33d18a25130c201b1611ed97 100644 (file)
@@ -106,12 +106,10 @@ namespace __profile
       multimap&
       operator=(multimap&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;
       }
 
index 22c1c53738c0d38d59169460f24664ef28adc9b9..653ba5b465336a27c4d787d6808d2bb4dca4e201 100644 (file)
@@ -104,12 +104,10 @@ namespace __profile
       multiset&
       operator=(multiset&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;
       }
 
index c5d462747f7751f4f826978cb0e3c74227f44bca..e2e357339dc11111e02d1d9badcf3535d18730e1 100644 (file)
@@ -104,12 +104,10 @@ namespace __profile
       set&
       operator=(set&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;
       }
 
index 7ef629a9094f54c92732f5c57e00cd180ae43a9c..74781de2dd4b49b8991db8fc98f00d837d740003 100644 (file)
@@ -130,12 +130,10 @@ namespace __profile
       unordered_map&
       operator=(unordered_map&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;
       }
 
@@ -358,12 +356,10 @@ namespace __profile
       unordered_multimap&
       operator=(unordered_multimap&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;
       }
 
index 8c9e7669c495c5aeef3804dbe1f0b95d7c8313c9..62bb1a423bd389ee6e1fd0f49dc9b6e10a99be15 100644 (file)
@@ -129,12 +129,10 @@ namespace __profile
       unordered_set&
       operator=(unordered_set&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;
       }
 
@@ -346,12 +344,10 @@ namespace __profile
       unordered_multiset&
       operator=(unordered_multiset&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         }
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;
       }
 
index 5ae45323dcb39597c4917aa84bdd48bb4ae1e09e..e4e680f86999f9e6e19406d9ff4abda9e25d3a6c 100644 (file)
@@ -140,13 +140,11 @@ namespace __profile
       vector&
       operator=(vector&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         }
-        return *this;
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
+       return *this;
       }
 
       vector&
index d697590073981d3d9a99c85ac8c6b7ccc42c93b7..ba8f67290172067d16e2e7eb285e53f972356e6f 100644 (file)
@@ -229,12 +229,10 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1
       unordered_map&
       operator=(unordered_map&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         } 
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;   
       }
 
@@ -315,12 +313,10 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1
       unordered_multimap&
       operator=(unordered_multimap&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         } 
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;   
       }
 
index 1270b17186a4ecc545057478c16a10f2e3b811a9..c11d9f3021b4f8613fccad3d9fbf463f95fa529d 100644 (file)
@@ -222,12 +222,10 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1
       unordered_set&
       operator=(unordered_set&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         } 
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;   
       }
 
@@ -305,12 +303,10 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1
       unordered_multiset&
       operator=(unordered_multiset&& __x)
       {
-       if (this != &__x)
-         {
-           // NB: DR 675.
-           this->clear();
-           this->swap(__x);
-         } 
+       // NB: DR 1204.
+       // NB: DR 675.
+       this->clear();
+       this->swap(__x);
        return *this;   
       }
 
diff --git a/libstdc++-v3/testsuite/23_containers/deque/cons/self_move_assign.cc b/libstdc++-v3/testsuite/23_containers/deque/cons/self_move_assign.cc
deleted file mode 100644 (file)
index e3c5180..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-// { dg-options "-std=gnu++0x" }
-
-// 2010-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <deque>
-#include <testsuite_hooks.h>
-
-void test01()
-{
-  bool test __attribute__((unused)) = true;
-
-  std::deque<int> d0(10, 1);
-  const std::deque<int> d1(d0);
-  d0 = std::move(d0);
-  VERIFY( d0.size() == 10 );
-  VERIFY( d0 == d1 );
-}
-
-int main()
-{
-  test01();
-  return 0;
-}
index 0a50b6d922051a90338901581f1cf1b384e56609..4263371f814f592c4805a318004fe378ceebb570 100644 (file)
@@ -18,7 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1578 }
+// { dg-error "no matching" "" { target *-*-* } 1576 }
 // { dg-excess-errors "" }
 
 #include <deque>
index a63fcfa5ea60ce4b1efd9ca72ec9cf434563181b..0a32f12d049d92c7ecf3cf578d3d1d714c4d22e4 100644 (file)
@@ -18,7 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1517 }
+// { dg-error "no matching" "" { target *-*-* } 1515 }
 // { dg-excess-errors "" }
 
 #include <deque>
index 298ec2de53297ed63f1dde5a3118e4533aba04b2..11993a9752baa26949a788a22b22569e6611b2a5 100644 (file)
@@ -18,7 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1517 }
+// { dg-error "no matching" "" { target *-*-* } 1515 }
 // { dg-excess-errors "" }
 
 #include <deque>
index cb303949ac8e46dcc3e612891759496a1ee8eac1..f1c45b269fbb86d44672ad45d13ae9e0e6cde5ff 100644 (file)
@@ -18,7 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1662 }
+// { dg-error "no matching" "" { target *-*-* } 1660 }
 // { dg-excess-errors "" }
 
 #include <deque>
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/cons/self_move_assign.cc b/libstdc++-v3/testsuite/23_containers/forward_list/cons/self_move_assign.cc
deleted file mode 100644 (file)
index d7b7298..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-// { dg-options "-std=gnu++0x" }
-
-// 2010-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <forward_list>
-#include <testsuite_hooks.h>
-
-void test01()
-{
-  bool test __attribute__((unused)) = true;
-
-  std::forward_list<int> fl0(10, 1);
-  const std::forward_list<int> fl1(fl0);
-  fl0 = std::move(fl0);
-  // VERIFY( fl0.size() == 10 );
-  VERIFY( fl0 == fl1 );
-}
-
-int main()
-{
-  test01();
-  return 0;
-}
index 0d167718278c799f46f58cfd5290543766b25863..1625e3bc76bef850529f310a5527a73581938429 100644 (file)
@@ -1,9 +1,9 @@
 // { dg-do compile }
 // { dg-options "-std=gnu++0x" }
-// { dg-error "no matching" "" { target *-*-* } 1197 }
+// { dg-error "no matching" "" { target *-*-* } 1196 }
 // { dg-excess-errors "" }
 
-// Copyright (C) 2009 Free Software Foundation
+// Copyright (C) 2009, 2010 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
index d72b9fa4c9d65cd68e7b83819b21f41d60d9da0f..5acfcd1f47f6908cacbc7721d6dc364d94d4db48 100644 (file)
@@ -1,9 +1,9 @@
 // { dg-do compile }
 // { dg-options "-std=gnu++0x" }
-// { dg-error "no matching" "" { target *-*-* } 1197 }
+// { dg-error "no matching" "" { target *-*-* } 1196 }
 // { dg-excess-errors "" }
 
-// Copyright (C) 2009 Free Software Foundation
+// Copyright (C) 2009, 2010 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
index f0481a3f45386e8b6442979984e71168192d7055..dcf69089b004a4b60ca342955cf4af7069d4b454 100644 (file)
@@ -1,9 +1,9 @@
 // { dg-do compile }
 // { dg-options "-std=gnu++0x" }
-// { dg-error "no matching" "" { target *-*-* } 1197 }
+// { dg-error "no matching" "" { target *-*-* } 1196 }
 // { dg-excess-errors "" }
 
-// Copyright (C) 2009 Free Software Foundation
+// Copyright (C) 2009, 2010 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
index c4a84ff38da7be26d2d631e8757b7f37cccf625d..22574fd081a16d5c413e4623aeb6d4a49869d027 100644 (file)
@@ -1,9 +1,9 @@
 // { dg-do compile }
 // { dg-options "-std=gnu++0x" }
-// { dg-error "no matching" "" { target *-*-* } 1197 }
+// { dg-error "no matching" "" { target *-*-* } 1196 }
 // { dg-excess-errors "" }
 
-// Copyright (C) 2009 Free Software Foundation
+// Copyright (C) 2009, 2010 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
diff --git a/libstdc++-v3/testsuite/23_containers/list/cons/self_move_assign.cc b/libstdc++-v3/testsuite/23_containers/list/cons/self_move_assign.cc
deleted file mode 100644 (file)
index d406ecd..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-// { dg-options "-std=gnu++0x" }
-
-// 2010-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <list>
-#include <testsuite_hooks.h>
-
-void test01()
-{
-  bool test __attribute__((unused)) = true;
-
-  std::list<int> l0(10, 1);
-  const std::list<int> l1(l0);
-  l0 = std::move(l0);
-  VERIFY( l0.size() == 10 );
-  VERIFY( l0 == l1 );
-}
-
-int main()
-{
-  test01();
-  return 0;
-}
index 24ee3fac6e7eda9a0896df5a395c4a0a41363b5f..d41e1498069062a4febc3aaf8e6295beb4203c69 100644 (file)
@@ -18,7 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1412 }
+// { dg-error "no matching" "" { target *-*-* } 1410 }
 // { dg-excess-errors "" }
 
 #include <list>
index 3e0f7d936cb4b16bbc4838c36bff587d1237c6c7..01d9135c8608a606da39ef6685b45843f4fab704 100644 (file)
@@ -18,7 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1381 }
+// { dg-error "no matching" "" { target *-*-* } 1379 }
 // { dg-excess-errors "" }
 
 #include <list>
index ec29e3b0f089fed078cac6d6583d2472b3a5c62c..c13f6565df4b4af8c991f3c26989af6286f5adf3 100644 (file)
@@ -18,7 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1381 }
+// { dg-error "no matching" "" { target *-*-* } 1379 }
 // { dg-excess-errors "" }
 
 #include <list>
index 0d4a001c117da723852dd902143d42045995a506..262a7a15f9430c018a8e4fcd454db2a3c60a5f45 100644 (file)
@@ -18,7 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1381 }
+// { dg-error "no matching" "" { target *-*-* } 1379 }
 // { dg-excess-errors "" }
 
 #include <list>
diff --git a/libstdc++-v3/testsuite/23_containers/map/cons/self_move_assign.cc b/libstdc++-v3/testsuite/23_containers/map/cons/self_move_assign.cc
deleted file mode 100644 (file)
index dbf153c..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-// { dg-options "-std=gnu++0x" }
-
-// 2010-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <map>
-#include <testsuite_hooks.h>
-
-void test01()
-{
-  bool test __attribute__((unused)) = true;
-
-  typedef std::map<int, int>       map_type;
-  typedef map_type::value_type   value_type;
-
-  map_type m0{ value_type(1, 1), value_type(2, 2), value_type(3, 3) };
-
-  const map_type m1(m0);
-  m0 = std::move(m0);
-  VERIFY( m0.size() == 3 );
-  VERIFY( m0 == m1 );
-}
-
-int main()
-{
-  test01();
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/23_containers/multimap/cons/self_move_assign.cc b/libstdc++-v3/testsuite/23_containers/multimap/cons/self_move_assign.cc
deleted file mode 100644 (file)
index 0d2f9e7..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-// { dg-options "-std=gnu++0x" }
-
-// 2010-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <map>
-#include <testsuite_hooks.h>
-
-void test01()
-{
-  bool test __attribute__((unused)) = true;
-
-  typedef std::multimap<int, int>    mmap_type;
-  typedef mmap_type::value_type     value_type;
-
-  mmap_type mm0{ value_type(1, 1), value_type(2, 2), value_type(3, 3) };
-
-  const mmap_type mm1(mm0);
-  mm0 = std::move(mm0);
-  VERIFY( mm0.size() == 3 );
-  VERIFY( mm0 == mm1 );
-}
-
-int main()
-{
-  test01();
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/23_containers/multiset/cons/self_move_assign.cc b/libstdc++-v3/testsuite/23_containers/multiset/cons/self_move_assign.cc
deleted file mode 100644 (file)
index f1e4e1d..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-// { dg-options "-std=gnu++0x" }
-
-// 2010-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <set>
-#include <testsuite_hooks.h>
-
-void test01()
-{
-  bool test __attribute__((unused)) = true;
-
-  typedef std::multiset<int>  mset_type;
-
-  mset_type ms0{ 1, 2, 3 };
-
-  const mset_type ms1(ms0);
-  ms0 = std::move(ms0);
-  VERIFY( ms0.size() == 3 );
-  VERIFY( ms0 == ms1 );
-}
-
-int main()
-{
-  test01();
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/23_containers/set/cons/self_move_assign.cc b/libstdc++-v3/testsuite/23_containers/set/cons/self_move_assign.cc
deleted file mode 100644 (file)
index d8f676b..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-// { dg-options "-std=gnu++0x" }
-
-// 2010-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <set>
-#include <testsuite_hooks.h>
-
-void test01()
-{
-  bool test __attribute__((unused)) = true;
-
-  typedef std::set<int>  set_type;
-
-  set_type s0{ 1, 2, 3 };
-
-  const set_type s1(s0);
-  s0 = std::move(s0);
-  VERIFY( s0.size() == 3 );
-  VERIFY( s0 == s1 );
-}
-
-int main()
-{
-  test01();
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/cons/self_move_assign.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/cons/self_move_assign.cc
deleted file mode 100644 (file)
index a31a1ee..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-// { dg-options "-std=gnu++0x" }
-
-// 2010-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <unordered_map>
-#include <testsuite_hooks.h>
-
-void test01()
-{
-  bool test __attribute__((unused)) = true;
-
-  typedef std::unordered_map<int, int>  umap_type;
-  typedef umap_type::value_type        value_type;
-
-  umap_type um0{ value_type(1, 1), value_type(2, 2), value_type(3, 3) };
-
-  const umap_type um1(um0);
-  um0 = std::move(um0);
-  VERIFY( um0.size() == 3 );
-  // VERIFY( um0 == um1 );
-}
-
-int main()
-{
-  test01();
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/cons/self_move_assign.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/cons/self_move_assign.cc
deleted file mode 100644 (file)
index c44e8d8..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-// { dg-options "-std=gnu++0x" }
-
-// 2010-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <unordered_map>
-#include <testsuite_hooks.h>
-
-void test01()
-{
-  bool test __attribute__((unused)) = true;
-
-  typedef std::unordered_multimap<int, int>  ummap_type;
-  typedef ummap_type::value_type             value_type;
-
-  ummap_type umm0{ value_type(1, 1), value_type(2, 2), value_type(3, 3) };
-
-  const ummap_type umm1(umm0);
-  umm0 = std::move(umm0);
-  VERIFY( umm0.size() == 3 );
-  // VERIFY( umm0 == umm1 );
-}
-
-int main()
-{
-  test01();
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/cons/self_move_assign.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/cons/self_move_assign.cc
deleted file mode 100644 (file)
index 7929f6b..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-// { dg-options "-std=gnu++0x" }
-
-// 2010-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <unordered_set>
-#include <testsuite_hooks.h>
-
-void test01()
-{
-  bool test __attribute__((unused)) = true;
-
-  typedef std::unordered_multiset<int>  umset_type;
-
-  umset_type ums0{ 1, 2, 3 };
-
-  const umset_type ums1(ums0);
-  ums0 = std::move(ums0);
-  VERIFY( ums0.size() == 3 );
-  // VERIFY( ums0 == ums1 );
-}
-
-int main()
-{
-  test01();
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/cons/self_move_assign.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/cons/self_move_assign.cc
deleted file mode 100644 (file)
index 7ce6db0..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-// { dg-options "-std=gnu++0x" }
-
-// 2010-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <unordered_set>
-#include <testsuite_hooks.h>
-
-void test01()
-{
-  bool test __attribute__((unused)) = true;
-
-  typedef std::unordered_set<int>   uset_type;
-
-  uset_type us0{ 1, 2, 3 };
-
-  const uset_type us1(us0);
-  us0 = std::move(us0);
-  VERIFY( us0.size() == 3 );
-  // VERIFY( us0 == us1 );
-}
-
-int main()
-{
-  test01();
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/23_containers/vector/cons/self_move_assign.cc b/libstdc++-v3/testsuite/23_containers/vector/cons/self_move_assign.cc
deleted file mode 100644 (file)
index d7c5d28..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-// { dg-options "-std=gnu++0x" }
-
-// 2010-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <vector>
-#include <testsuite_hooks.h>
-
-void test01()
-{
-  bool test __attribute__((unused)) = true;
-
-  std::vector<int> v0(10, 1);
-  const std::vector<int> v1(v0);
-  v0 = std::move(v0);
-  VERIFY( v0.size() == 10 );
-  VERIFY( v0 == v1 );
-}
-
-int main()
-{
-  test01();
-  return 0;
-}
index bb9a56e924f342c105e0ca8dbfec5354999fc82b..f0fae0083ba3ff5896200c1a21b2a95c59c4137f 100644 (file)
@@ -18,7 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1057 }
+// { dg-error "no matching" "" { target *-*-* } 1055 }
 // { dg-excess-errors "" }
 
 #include <vector>
index 02ae1c4c7279ec5cd3ae7a566fd57fb04d60e78f..ea0acfb5a91d843051022aaf2aa9816e2d7944e7 100644 (file)
@@ -18,7 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 997 }
+// { dg-error "no matching" "" { target *-*-* } 995 }
 // { dg-excess-errors "" }
 
 #include <vector>
index f9c3f4a2205a5806838688ff87bbda2b91ab931a..67dd1f33e115cf72916648ee3b50cf20f1b42417 100644 (file)
@@ -18,7 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 997 }
+// { dg-error "no matching" "" { target *-*-* } 995 }
 // { dg-excess-errors "" }
 
 #include <vector>
index 82acbbc97b97080df402caab713896504f48f19b..9eb0ab15acf7c8a48f0874742e601b234336af86 100644 (file)
@@ -18,7 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-do compile }
-// { dg-error "no matching" "" { target *-*-* } 1098 }
+// { dg-error "no matching" "" { target *-*-* } 1096 }
 // { dg-excess-errors "" }
 
 #include <vector>
diff --git a/libstdc++-v3/testsuite/ext/vstring/cons/self_move_assign.cc b/libstdc++-v3/testsuite/ext/vstring/cons/self_move_assign.cc
deleted file mode 100644 (file)
index caa8e4f..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-// { dg-options "-std=gnu++0x" }
-// { dg-require-string-conversions "" }
-
-// 2010-01-08  Paolo Carlini  <paolo.carlini@oracle.com>
-
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <ext/vstring.h>
-#include <testsuite_hooks.h>
-
-void test01()
-{
-  bool test __attribute__((unused)) = true;
-
-  __gnu_cxx::__vstring vs0(10, 'a');
-  const __gnu_cxx::__vstring vs1(vs0);
-  vs0 = std::move(vs0);
-  VERIFY( vs0.size() == 10 );
-  VERIFY( vs0 == vs1 );
-}
-
-int main()
-{
-  test01();
-  return 0;
-}