procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stl_vector.h (vector<>::data): Fix return type in c++0x mode.

Browse source 
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
This commit is contained in:
Paolo Carlini 2010-05-28 21:47:07 +00:00 • committed by Paolo Carlini
parent 984ad4496b
commit 2fb16a392a
6 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libstdc++-v3/ChangeLog
View file

@ -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:

12
libstdc++-v3/include/bits/stl_vector.h
View file

@ -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
/**

2
libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc
View file

@ -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>

2
libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc
View file

@ -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>

2
libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc
View file

@ -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>

2
libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc
View file

@ -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>