diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2010-05-28 21:47:07 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-05-28 21:47:07 +0000 |
| commit | 2fb16a392a9d1d28c249713d5d1a311d17f5e744 (patch) | |
| tree | 8aa0d1f4f4ab82a468c5b887567e38458a6e9863 | |
| parent | 984ad4496bd398d0bf4c6a440fe0eb823f82508c (diff) | |
| download | gcc-2fb16a392a9d1d28c249713d5d1a311d17f5e744.zip gcc-2fb16a392a9d1d28c249713d5d1a311d17f5e744.tar.gz gcc-2fb16a392a9d1d28c249713d5d1a311d17f5e744.tar.bz2 | |
stl_vector.h (vector<>::data): Fix return type in c++0x mode.
2010-05-28 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/stl_vector.h (vector<>::data): Fix return type
in c++0x mode.
* testsuite/23_containers/vector/requirements/dr438/
assign_neg.cc: Adjust dg-error line number.
* 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.
From-SVN: r159998
6 files changed, 27 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b6a0b1e..5e6702b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,16 @@ +2010-05-28 Paolo Carlini <paolo.carlini@oracle.com> + + * include/bits/stl_vector.h (vector<>::data): Fix return type + in c++0x mode. + * testsuite/23_containers/vector/requirements/dr438/ + assign_neg.cc: Adjust dg-error line number. + * 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. + 2010-05-27 Jason Merrill <jason@redhat.com> Revert: diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h index 96fc86c..f025b4e 100644 --- a/libstdc++-v3/include/bits/stl_vector.h +++ b/libstdc++-v3/include/bits/stl_vector.h @@ -718,13 +718,21 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) * Returns a pointer such that [data(), data() + size()) is a valid * range. For a non-empty %vector, data() == &front(). */ +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + _Tp* +#else pointer +#endif data() - { return pointer(this->_M_impl._M_start); } + { return std::__addressof(front()); } +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + const _Tp* +#else const_pointer +#endif data() const - { return const_pointer(this->_M_impl._M_start); } + { return std::__addressof(front()); } // [23.2.4.3] modifiers /** 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 f0fae00..b96b535 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 @@ -18,7 +18,7 @@ // <http://www.gnu.org/licenses/>. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1055 } +// { dg-error "no matching" "" { target *-*-* } 1063 } // { dg-excess-errors "" } #include <vector> 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 ea0acfb..9506438 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 @@ -18,7 +18,7 @@ // <http://www.gnu.org/licenses/>. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 995 } +// { dg-error "no matching" "" { target *-*-* } 1003 } // { dg-excess-errors "" } #include <vector> 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 67dd1f3..f17b541 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 @@ -18,7 +18,7 @@ // <http://www.gnu.org/licenses/>. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 995 } +// { dg-error "no matching" "" { target *-*-* } 1003 } // { dg-excess-errors "" } #include <vector> 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 9eb0ab1..19d3fd0 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 @@ -18,7 +18,7 @@ // <http://www.gnu.org/licenses/>. // { dg-do compile } -// { dg-error "no matching" "" { target *-*-* } 1096 } +// { dg-error "no matching" "" { target *-*-* } 1104 } // { dg-excess-errors "" } #include <vector> |