git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scoped_allocator (scoped_allocator::__outermost): Do not pass non-POD to varargs function. 

* include/std/scoped_allocator (scoped_allocator::__outermost): Do
	not pass non-POD to varargs function.
	* testsuite/20_util/scoped_allocator/1.cc: Fix test.

From-SVN: r186836
This commit is contained in:
Jonathan Wakely 2012-04-25 18:03:03 +00:00 committed by Jonathan Wakely
parent 98095aa337
commit 862023d77a
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2012-04-25 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/std/scoped_allocator (scoped_allocator::__outermost): Do
not pass non-POD to varargs function.
* testsuite/20_util/scoped_allocator/1.cc: Fix test.
2012-04-24 Benjamin Kosnik <bkoz@redhat.com> 2012-04-24 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/52689 PR libstdc++/52689

8
libstdc++-v3/include/std/scoped_allocator
View File

@ -1,6 +1,6 @@
// <scoped_allocator> -*- C++ -*- // <scoped_allocator> -*- C++ -*-
// Copyright (C) 2011 Free Software Foundation, Inc. // Copyright (C) 2011, 2012 Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the // software; you can redistribute it and/or modify it under the
@ -77,7 +77,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Alloc> template<typename _Alloc>
inline auto inline auto
__do_outermost(_Alloc& __a, _Alloc&) -> decltype(__a.outer_allocator()) __do_outermost(_Alloc& __a, _Alloc*) -> decltype(__a.outer_allocator())
{ return __a.outer_allocator(); } { return __a.outer_allocator(); }
template<typename _Alloc> template<typename _Alloc>
@ -87,8 +87,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Alloc> template<typename _Alloc>
inline auto inline auto
__outermost(_Alloc& __a) -> decltype(__do_outermost(__a, __a)) __outermost(_Alloc& __a) -> decltype(__do_outermost(__a, &__a))
{ return __do_outermost(__a, __a); } { return __do_outermost(__a, &__a); }
template<typename _OuterAlloc, typename... _InnerAllocs> template<typename _OuterAlloc, typename... _InnerAllocs>
class scoped_allocator_adaptor; class scoped_allocator_adaptor;

18
libstdc++-v3/testsuite/20_util/scoped_allocator/1.cc
View File

@ -1,6 +1,6 @@
// { dg-options "-std=gnu++0x" } // { dg-options "-std=gnu++0x" }
// Copyright (C) 2011 Free Software Foundation, Inc. // Copyright (C) 2011, 2012 Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the // software; you can redistribute it and/or modify it under the
@ -33,7 +33,7 @@ struct Element
Element(const allocator_type& a = allocator_type()) : alloc(a) { } Element(const allocator_type& a = allocator_type()) : alloc(a) { }
Element(std::allocator_arg_t, const allocator_type& a, int i = 0) Element(std::allocator_arg_t, const allocator_type& a, int = 0)
: alloc(a) { } : alloc(a) { }
Element(std::allocator_arg_t, const allocator_type& a, const Element&) Element(std::allocator_arg_t, const allocator_type& a, const Element&)
@ -53,6 +53,7 @@ void test01()
alloc1_type a1(1); alloc1_type a1(1);
Element e; Element e;
EltVec ev1(1, e, a1); EltVec ev1(1, e, a1);
VERIFY( ev1.get_allocator().get_personality() == 1 );
VERIFY( ev1[0].get_allocator().get_personality() == 1 ); VERIFY( ev1[0].get_allocator().get_personality() == 1 );
} }
@ -60,14 +61,16 @@ void test02()
{ {
bool test __attribute((unused)) = false; bool test __attribute((unused)) = false;
typedef std::vector<Element, Element::allocator_type> EltVec; typedef std::scoped_allocator_adaptor<Element::allocator_type> inner_alloc_type;
typedef std::scoped_allocator_adaptor<EltVec::allocator_type, typedef std::vector<Element, inner_alloc_type> EltVec;
Element::allocator_type> alloc_type;
typedef std::scoped_allocator_adaptor<Element::allocator_type,
Element::allocator_type> alloc_type;
typedef std::vector<EltVec, alloc_type> EltVecVec; typedef std::vector<EltVec, alloc_type> EltVecVec;
alloc_type a(1, 2); alloc_type a(1, Element::allocator_type(2)); // outer=1, inner=2
Element e; Element e;
EltVec ev(1, e); EltVec ev(1, e);
EltVecVec evv(1, ev, a); EltVecVec evv(1, ev, a);
@ -76,7 +79,7 @@ void test02()
VERIFY( evv[0].get_allocator().get_personality() == 2 ); VERIFY( evv[0].get_allocator().get_personality() == 2 );
VERIFY( evv[0][0].get_allocator().get_personality() == 2 ); VERIFY( evv[0][0].get_allocator().get_personality() == 2 );
alloc_type a2(3, 4); alloc_type a2(3, Element::allocator_type(4)); // outer=3, inner=4
EltVecVec evv2(evv, a2); // copy with a different allocator EltVecVec evv2(evv, a2); // copy with a different allocator
@ -96,4 +99,5 @@ void test02()
int main() int main()
{ {
test01(); test01();
test02();
} }