From f2fe0d028c999e27a7e6aff4fb97f518d434a288 Mon Sep 17 00:00:00 2001 From: paolo Date: Fri, 9 Nov 2007 17:18:10 +0000 Subject: [PATCH] 2007-11-09 Paolo Carlini * include/bits/stl_deque.h (deque<>::operator=(deque&&)): Implement resolution of DR 675, call clear first. * include/bits/stl_list.h (list<>::operator=(list&&)): Likewise. * include/bits/stl_bvector.h (vector::operator=(vector&&)): Likewise. * include/bits/stl_vector.h (vector<>::operator=(vector&&)): Likewise. * include/bits/stl_map.h (map<>::operator=(map&&)): Likewise. * include/bits/stl_multimap.h (multimap<>::operator=(multimap&&)): Likewise. * include/bits/stl_multiset.h (multiset<>::operator=(multiset&&)): Likewise. * include/bits/stl_set.h (set<>::operator=(set&&)): Likewise. * include/debug/map.h (map<>::operator=(map&&)): Likewise. * include/debug/set.h (set<>::operator=(set&&)): Likewise. * include/debug/multimap.h (multimap<>::operator=(multimap&&)): Likewise. * include/debug/multiset.h (multiset<>::operator=(multiset&&)): Likewise. * include/debug/deque (deque<>::operator=(deque&&)): Likewise. * include/debug/list (list<>::operator=(list&&)): Likewise. * include/debug/vector (vector<>::operator=(vector&&)): Likewise. * testsuite/23_containers/multimap/moveable.cc: Adjust. * testsuite/23_containers/multiset/moveable.cc: Likewise. * testsuite/23_containers/set/moveable.cc: Likewise. * testsuite/23_containers/map/moveable.cc: Likewise. * testsuite/20_util/pair/moveable.cc: Likewise. * testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Adjust dg-error line numbers. * testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Likewise. * testsuite/23_containers/deque/requirements/dr438/ constructor_1_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. * testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Likewise. * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@130051 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 53 ++++++++++++++++++++++ libstdc++-v3/include/bits/stl_bvector.h | 4 +- libstdc++-v3/include/bits/stl_deque.h | 2 + libstdc++-v3/include/bits/stl_list.h | 2 + libstdc++-v3/include/bits/stl_map.h | 2 + libstdc++-v3/include/bits/stl_multimap.h | 2 + libstdc++-v3/include/bits/stl_multiset.h | 2 + libstdc++-v3/include/bits/stl_set.h | 2 + libstdc++-v3/include/bits/stl_vector.h | 4 +- libstdc++-v3/include/debug/deque | 2 + libstdc++-v3/include/debug/list | 2 + libstdc++-v3/include/debug/map.h | 2 + libstdc++-v3/include/debug/multimap.h | 2 + libstdc++-v3/include/debug/multiset.h | 2 + libstdc++-v3/include/debug/set.h | 2 + libstdc++-v3/include/debug/vector | 2 + libstdc++-v3/testsuite/20_util/pair/moveable.cc | 2 +- .../deque/requirements/dr438/assign_neg.cc | 2 +- .../deque/requirements/dr438/constructor_1_neg.cc | 2 +- .../deque/requirements/dr438/constructor_2_neg.cc | 2 +- .../deque/requirements/dr438/insert_neg.cc | 2 +- .../list/requirements/dr438/assign_neg.cc | 2 +- .../list/requirements/dr438/constructor_1_neg.cc | 2 +- .../list/requirements/dr438/constructor_2_neg.cc | 2 +- .../list/requirements/dr438/insert_neg.cc | 2 +- .../testsuite/23_containers/map/moveable.cc | 2 +- .../testsuite/23_containers/multimap/moveable.cc | 2 +- .../testsuite/23_containers/multiset/moveable.cc | 2 +- .../testsuite/23_containers/set/moveable.cc | 2 +- .../vector/requirements/dr438/assign_neg.cc | 2 +- .../vector/requirements/dr438/constructor_1_neg.cc | 2 +- .../vector/requirements/dr438/constructor_2_neg.cc | 2 +- .../vector/requirements/dr438/insert_neg.cc | 2 +- 33 files changed, 102 insertions(+), 19 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index baea4ac..c07aae4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,58 @@ 2007-11-09 Paolo Carlini + * include/bits/stl_deque.h (deque<>::operator=(deque&&)): Implement + resolution of DR 675, call clear first. + * include/bits/stl_list.h (list<>::operator=(list&&)): Likewise. + * include/bits/stl_bvector.h (vector::operator=(vector&&)): + Likewise. + * include/bits/stl_vector.h (vector<>::operator=(vector&&)): Likewise. + * include/bits/stl_map.h (map<>::operator=(map&&)): Likewise. + * include/bits/stl_multimap.h (multimap<>::operator=(multimap&&)): + Likewise. + * include/bits/stl_multiset.h (multiset<>::operator=(multiset&&)): + Likewise. + * include/bits/stl_set.h (set<>::operator=(set&&)): Likewise. + * include/debug/map.h (map<>::operator=(map&&)): Likewise. + * include/debug/set.h (set<>::operator=(set&&)): Likewise. + * include/debug/multimap.h (multimap<>::operator=(multimap&&)): + Likewise. + * include/debug/multiset.h (multiset<>::operator=(multiset&&)): + Likewise. + * include/debug/deque (deque<>::operator=(deque&&)): Likewise. + * include/debug/list (list<>::operator=(list&&)): Likewise. + * include/debug/vector (vector<>::operator=(vector&&)): Likewise. + * testsuite/23_containers/multimap/moveable.cc: Adjust. + * testsuite/23_containers/multiset/moveable.cc: Likewise. + * testsuite/23_containers/set/moveable.cc: Likewise. + * testsuite/23_containers/map/moveable.cc: Likewise. + * testsuite/20_util/pair/moveable.cc: Likewise. + * testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: + Adjust dg-error line numbers. + * testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: + Likewise. + * testsuite/23_containers/deque/requirements/dr438/ + constructor_1_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. + * testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: + Likewise. + * 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. + +2007-11-09 Paolo Carlini + PR libstdc++/34032 * acinclude.m4 ([GLIBCXX_ENABLE_C99], [GLIBCXX_CHECK_C99_TR1]): Use -std=c++98 instead of the default -std=gnu++98. diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index cb99b22..255e00b 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -560,7 +560,9 @@ template #ifdef __GXX_EXPERIMENTAL_CXX0X__ vector& operator=(vector&& __x) - { + { + // NB: DR 675. + this->clear(); this->swap(__x); return *this; } diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h index 356cff2..ae01eae 100644 --- a/libstdc++-v3/include/bits/stl_deque.h +++ b/libstdc++-v3/include/bits/stl_deque.h @@ -808,6 +808,8 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) deque& operator=(deque&& __x) { + // NB: DR 675. + this->clear(); this->swap(__x); return *this; } diff --git a/libstdc++-v3/include/bits/stl_list.h b/libstdc++-v3/include/bits/stl_list.h index 4de31d8..41b84f3 100644 --- a/libstdc++-v3/include/bits/stl_list.h +++ b/libstdc++-v3/include/bits/stl_list.h @@ -582,6 +582,8 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) list& operator=(list&& __x) { + // NB: DR 675. + this->clear(); this->swap(__x); return *this; } diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h index bc9d13be..6426440 100644 --- a/libstdc++-v3/include/bits/stl_map.h +++ b/libstdc++-v3/include/bits/stl_map.h @@ -255,6 +255,8 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) map& operator=(map&& __x) { + // NB: DR 675. + this->clear(); this->swap(__x); return *this; } diff --git a/libstdc++-v3/include/bits/stl_multimap.h b/libstdc++-v3/include/bits/stl_multimap.h index a280692..76d6b47 100644 --- a/libstdc++-v3/include/bits/stl_multimap.h +++ b/libstdc++-v3/include/bits/stl_multimap.h @@ -253,6 +253,8 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) multimap& operator=(multimap&& __x) { + // NB: DR 675. + this->clear(); this->swap(__x); return *this; } diff --git a/libstdc++-v3/include/bits/stl_multiset.h b/libstdc++-v3/include/bits/stl_multiset.h index 60d4d9c..5c897bd 100644 --- a/libstdc++-v3/include/bits/stl_multiset.h +++ b/libstdc++-v3/include/bits/stl_multiset.h @@ -225,6 +225,8 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) multiset& operator=(multiset&& __x) { + // NB: DR 675. + this->clear(); this->swap(__x); return *this; } diff --git a/libstdc++-v3/include/bits/stl_set.h b/libstdc++-v3/include/bits/stl_set.h index d260156..3eb4b26 100644 --- a/libstdc++-v3/include/bits/stl_set.h +++ b/libstdc++-v3/include/bits/stl_set.h @@ -232,6 +232,8 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) set& operator=(set&& __x) { + // NB: DR 675. + this->clear(); this->swap(__x); return *this; } diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h index bf2cc27..0e5e6c1 100644 --- a/libstdc++-v3/include/bits/stl_vector.h +++ b/libstdc++-v3/include/bits/stl_vector.h @@ -325,7 +325,9 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) */ vector& operator=(vector&& __x) - { + { + // NB: DR 675. + this->clear(); this->swap(__x); return *this; } diff --git a/libstdc++-v3/include/debug/deque b/libstdc++-v3/include/debug/deque index 6571d15..8d3bf83 100644 --- a/libstdc++-v3/include/debug/deque +++ b/libstdc++-v3/include/debug/deque @@ -110,6 +110,8 @@ namespace __debug deque& operator=(deque&& __x) { + // NB: DR 675. + clear(); swap(__x); return *this; } diff --git a/libstdc++-v3/include/debug/list b/libstdc++-v3/include/debug/list index 7174334..9e78fc9 100644 --- a/libstdc++-v3/include/debug/list +++ b/libstdc++-v3/include/debug/list @@ -139,6 +139,8 @@ namespace __debug list& operator=(list&& __x) { + // NB: DR 675. + clear(); swap(__x); return *this; } diff --git a/libstdc++-v3/include/debug/map.h b/libstdc++-v3/include/debug/map.h index 671e1f8..1657564 100644 --- a/libstdc++-v3/include/debug/map.h +++ b/libstdc++-v3/include/debug/map.h @@ -114,6 +114,8 @@ namespace __debug map& operator=(map&& __x) { + // NB: DR 675. + clear(); swap(__x); return *this; } diff --git a/libstdc++-v3/include/debug/multimap.h b/libstdc++-v3/include/debug/multimap.h index 1dd4de8..72f4411 100644 --- a/libstdc++-v3/include/debug/multimap.h +++ b/libstdc++-v3/include/debug/multimap.h @@ -115,6 +115,8 @@ namespace __debug multimap& operator=(multimap&& __x) { + // NB: DR 675. + clear(); swap(__x); return *this; } diff --git a/libstdc++-v3/include/debug/multiset.h b/libstdc++-v3/include/debug/multiset.h index 7c58db1..ffe5b51 100644 --- a/libstdc++-v3/include/debug/multiset.h +++ b/libstdc++-v3/include/debug/multiset.h @@ -112,6 +112,8 @@ namespace __debug multiset& operator=(multiset&& __x) { + // NB: DR 675. + clear(); swap(__x); return *this; } diff --git a/libstdc++-v3/include/debug/set.h b/libstdc++-v3/include/debug/set.h index bebc34c..3115610 100644 --- a/libstdc++-v3/include/debug/set.h +++ b/libstdc++-v3/include/debug/set.h @@ -112,6 +112,8 @@ namespace __debug set& operator=(set&& __x) { + // NB: DR 675. + clear(); swap(__x); return *this; } diff --git a/libstdc++-v3/include/debug/vector b/libstdc++-v3/include/debug/vector index c5e4d12..8890ab9 100644 --- a/libstdc++-v3/include/debug/vector +++ b/libstdc++-v3/include/debug/vector @@ -123,6 +123,8 @@ namespace __debug vector& operator=(vector&& __x) { + // NB: DR 675. + clear(); swap(__x); return *this; } diff --git a/libstdc++-v3/testsuite/20_util/pair/moveable.cc b/libstdc++-v3/testsuite/20_util/pair/moveable.cc index e843210..cd5de41 100644 --- a/libstdc++-v3/testsuite/20_util/pair/moveable.cc +++ b/libstdc++-v3/testsuite/20_util/pair/moveable.cc @@ -58,7 +58,7 @@ test2() std::pair > q = make_pair(2,w); p = std::move(q); VERIFY(p.first == 2 && q.first == 2 && - p.second.size() == 2 && q.second.size() == 1); + p.second.size() == 2 && q.second.size() == 0); std::pair > r(std::move(p)); VERIFY(r.first == 2 && p.first == 2 && r.second.size() == 2 && p.second.size() == 0); diff --git a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/assign_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/assign_neg.cc index 12c510a..929045f 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/assign_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/assign_neg.cc @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1400 } +// { dg-error "no matching" "" { target *-*-* } 1402 } // { dg-excess-errors "" } #include diff --git a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc index 49c1cfd..f133b86 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_1_neg.cc @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1335 } +// { dg-error "no matching" "" { target *-*-* } 1337 } // { dg-excess-errors "" } #include diff --git a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc index 58042e1..a60f922 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/constructor_2_neg.cc @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1335 } +// { dg-error "no matching" "" { target *-*-* } 1337 } // { dg-excess-errors "" } #include diff --git a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/insert_neg.cc b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/insert_neg.cc index 2d00333..9b8258d 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/insert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/requirements/dr438/insert_neg.cc @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1480 } +// { dg-error "no matching" "" { target *-*-* } 1482 } // { dg-excess-errors "" } #include diff --git a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc index 187b751..9655db0 100644 --- a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/assign_neg.cc @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1234 } +// { dg-error "no matching" "" { target *-*-* } 1236 } // { dg-excess-errors "" } #include diff --git a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc index 843cb46..7899588 100644 --- a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_1_neg.cc @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1203 } +// { dg-error "no matching" "" { target *-*-* } 1205 } // { dg-excess-errors "" } #include diff --git a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc index 56a8056..1624cf8 100644 --- a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/constructor_2_neg.cc @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1203 } +// { dg-error "no matching" "" { target *-*-* } 1205 } // { dg-excess-errors "" } #include diff --git a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc index 8c2014d..fddbdac 100644 --- a/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/list/requirements/dr438/insert_neg.cc @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1203 } +// { dg-error "no matching" "" { target *-*-* } 1205 } // { dg-excess-errors "" } #include diff --git a/libstdc++-v3/testsuite/23_containers/map/moveable.cc b/libstdc++-v3/testsuite/23_containers/map/moveable.cc index 5244708..c3ab6b0 100644 --- a/libstdc++-v3/testsuite/23_containers/map/moveable.cc +++ b/libstdc++-v3/testsuite/23_containers/map/moveable.cc @@ -43,7 +43,7 @@ int main() a[2]=0; b[1]=0; b = std::move(a); - VERIFY(b.find(2) != b.end() && a.find(1) != a.end()); + VERIFY(b.find(2) != b.end() && a.find(1) == a.end()); std::map c(std::move(b)); VERIFY( c.find(2) != c.end()); diff --git a/libstdc++-v3/testsuite/23_containers/multimap/moveable.cc b/libstdc++-v3/testsuite/23_containers/multimap/moveable.cc index 87796f4..f3921a3 100644 --- a/libstdc++-v3/testsuite/23_containers/multimap/moveable.cc +++ b/libstdc++-v3/testsuite/23_containers/multimap/moveable.cc @@ -43,7 +43,7 @@ int main() a.insert(std::make_pair(2,0)); b.insert(std::make_pair(1,0)); b = std::move(a); - VERIFY(b.find(2) != b.end() && a.find(1) != a.end()); + VERIFY(b.find(2) != b.end() && a.find(1) == a.end()); std::multimap c(std::move(b)); VERIFY( c.find(2) != c.end()); diff --git a/libstdc++-v3/testsuite/23_containers/multiset/moveable.cc b/libstdc++-v3/testsuite/23_containers/multiset/moveable.cc index c3ca111..a326ceb 100644 --- a/libstdc++-v3/testsuite/23_containers/multiset/moveable.cc +++ b/libstdc++-v3/testsuite/23_containers/multiset/moveable.cc @@ -43,7 +43,7 @@ int main() a.insert(2); b.insert(1); b = std::move(a); - VERIFY(b.find(2) != b.end() && a.find(1) != a.end()); + VERIFY(b.find(2) != b.end() && a.find(1) == a.end()); std::multiset c(std::move(b)); VERIFY( c.find(2) != c.end()); diff --git a/libstdc++-v3/testsuite/23_containers/set/moveable.cc b/libstdc++-v3/testsuite/23_containers/set/moveable.cc index b85ae58..8bfc2d2 100644 --- a/libstdc++-v3/testsuite/23_containers/set/moveable.cc +++ b/libstdc++-v3/testsuite/23_containers/set/moveable.cc @@ -43,7 +43,7 @@ int main() a.insert(2); b.insert(1); b = std::move(a); - VERIFY(b.find(2) != b.end() && a.find(1) != a.end()); + VERIFY(b.find(2) != b.end() && a.find(1) == a.end()); std::set c(std::move(b)); VERIFY( c.find(2) != c.end()); diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc index 6e7d587..beae46d 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 995 } +// { dg-error "no matching" "" { target *-*-* } 997 } // { dg-excess-errors "" } #include diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc index 532d89a..47023c5 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 935 } +// { dg-error "no matching" "" { target *-*-* } 937 } // { dg-excess-errors "" } #include diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc index 640aa79..462058c5 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 935 } +// { dg-error "no matching" "" { target *-*-* } 937 } // { dg-excess-errors "" } #include diff --git a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc index 1971317..834e10e 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc @@ -19,7 +19,7 @@ // USA. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1036 } +// { dg-error "no matching" "" { target *-*-* } 1038 } // { dg-excess-errors "" } #include -- 2.7.4