diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-20 17:01:19 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-20 17:01:19 +0000 |
| commit | 5d694b7ef8a735a8d8b142cbef1cb32be29deb7d (patch) | |
| tree | b06e200cb2dff68ca6ef7d0cdb61ccf3d1ab6c7e | |
| parent | 0b991a69de7228c71f550ee64edae382dd309f64 (diff) | |
| download | ppe42-gcc-5d694b7ef8a735a8d8b142cbef1cb32be29deb7d.tar.gz ppe42-gcc-5d694b7ef8a735a8d8b142cbef1cb32be29deb7d.zip | |
* include/bits/stl_list.h (list::_M_size): Use NSDMI.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc:
Adjust line numbers.
* 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/list/requirements/dr438/insert_neg.cc:
Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185580 138bc75d-0d04-0410-961f-82ee72b054a4
6 files changed, 18 insertions, 12 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cc699338e44..ef43bdc607c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,15 @@ +2012-03-19 Jonathan Wakely <jwakely.gcc@gmail.com> + + * include/bits/stl_list.h (list::_M_size): Use NSDMI. + * testsuite/23_containers/list/requirements/dr438/assign_neg.cc: + Adjust line numbers. + * 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/list/requirements/dr438/insert_neg.cc: + Likewise. + 2012-03-19 Paweł Sikora <pawel.sikora@agmk.net> PR libstdc++/52540 diff --git a/libstdc++-v3/include/bits/stl_list.h b/libstdc++-v3/include/bits/stl_list.h index 1e760ede693..634b579a03f 100644 --- a/libstdc++-v3/include/bits/stl_list.h +++ b/libstdc++-v3/include/bits/stl_list.h @@ -314,26 +314,20 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER __detail::_List_node_base _M_node; #ifdef __GXX_EXPERIMENTAL_CXX0X__ - size_t _M_size; + size_t _M_size = 0; #endif _List_impl() : _Node_alloc_type(), _M_node() -#ifdef __GXX_EXPERIMENTAL_CXX0X__ - , _M_size(0) -#endif { } _List_impl(const _Node_alloc_type& __a) : _Node_alloc_type(__a), _M_node() -#ifdef __GXX_EXPERIMENTAL_CXX0X__ - , _M_size(0) -#endif { } #ifdef __GXX_EXPERIMENTAL_CXX0X__ _List_impl(_Node_alloc_type&& __a) - : _Node_alloc_type(std::move(__a)), _M_node(), _M_size(0) + : _Node_alloc_type(std::move(__a)), _M_node() { } #endif }; 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 c088e6c5f11..05664b9c51c 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 @@ -18,7 +18,7 @@ // <http://www.gnu.org/licenses/>. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1574 } +// { dg-error "no matching" "" { target *-*-* } 1568 } #include <list> 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 94fbe9afebb..0ef8da89e7f 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 @@ -18,7 +18,7 @@ // <http://www.gnu.org/licenses/>. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1530 } +// { dg-error "no matching" "" { target *-*-* } 1524 } #include <list> 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 c02d5a5426d..f0836f6a843 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 @@ -18,7 +18,7 @@ // <http://www.gnu.org/licenses/>. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1530 } +// { dg-error "no matching" "" { target *-*-* } 1524 } #include <list> #include <utility> 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 c2fa73716f2..db63e39f295 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 @@ -18,7 +18,7 @@ // <http://www.gnu.org/licenses/>. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1530 } +// { dg-error "no matching" "" { target *-*-* } 1524 } #include <list> |
