diff options
| author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2012-03-20 17:01:19 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2012-03-20 17:01:19 +0000 |
| commit | b4db974a6bbbc58bc3eca4521d8fcb74f921e9cb (patch) | |
| tree | b06e200cb2dff68ca6ef7d0cdb61ccf3d1ab6c7e | |
| parent | ee289e459419e5ddfd82482a68e82ce6d20a2cee (diff) | |
| download | gcc-b4db974a6bbbc58bc3eca4521d8fcb74f921e9cb.zip gcc-b4db974a6bbbc58bc3eca4521d8fcb74f921e9cb.tar.gz gcc-b4db974a6bbbc58bc3eca4521d8fcb74f921e9cb.tar.bz2 | |
stl_list.h (list::_M_size): Use NSDMI.
* 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.
From-SVN: r185580
6 files changed, 18 insertions, 12 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cc69933..ef43bdc 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 1e760ed..634b579 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 c088e6c..05664b9 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 94fbe9a..0ef8da8 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 c02d5a5..f0836f6 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 c2fa737..db63e39 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> |