OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libstdc++/10378 ([library DR 402] cannot add object with inplace new into STL collections) 

2003-12-01  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/10378
	* include/bits/allocator.h (allocator::construct): Implement
	resolution of DR 402 [Ready] (in Revision 28).
	* include/bits/allocator_traits.h (__allocator::construct):
	Likewise.
	* include/bits/stl_construct.h (_Construct): Likewise.
	* testsuite/20_util/allocator_members.cc: Move to...
	* testsuite/20_util/allocator/1.cc: ... here.
	* testsuite/20_util/allocator/10378.cc: New.
	* docs/html/ext/howto.html: Add an entry for DR 402.

From-SVN: r74104
This commit is contained in:
Paolo Carlini 2003-12-01 15:34:07 +00:00 committed by Paolo Carlini
parent ec22cdf140
commit 9dbaa9489f
7 changed files with 82 additions and 5 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 @@
2003-12-01 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/10378
* include/bits/allocator.h (allocator::construct): Implement
resolution of DR 402 [Ready] (in Revision 28).
* include/bits/allocator_traits.h (__allocator::construct):
Likewise.
* include/bits/stl_construct.h (_Construct): Likewise.
* testsuite/20_util/allocator_members.cc: Move to...
* testsuite/20_util/allocator/1.cc: ... here.
* testsuite/20_util/allocator/10378.cc: New.
* docs/html/ext/howto.html: Add an entry for DR 402.
2003-11-30 Paolo Carlini <pcarlini@suse.de>
* config/locale/gnu/codecvt_members.cc (codecvt::do_in,

6
libstdc++-v3/docs/html/ext/howto.html
View File

@ -694,6 +694,12 @@
</dt>
<dd>Change the format string to &quot;%.0Lf&quot;.
</dd>
<dt><a href="lwg-active.html#402">402</a>:
<em>Wrong new expression in [some_]allocator::construct</em>
</dt>
<dd>Replace &quot;new&quot; with &quot;::new&quot;.
</dd>
<!--
<dt><a href="lwg-defects.html#"></a>:
<em></em>

4
libstdc++-v3/include/bits/allocator.h
View File

@ -172,8 +172,10 @@ namespace std
size_type
max_size() const throw() { return size_t(-1) / sizeof(_Tp); }
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 402. wrong new expression in [some_]allocator::construct
void
construct(pointer __p, const _Tp& __val) { new(__p) _Tp(__val); }
construct(pointer __p, const _Tp& __val) { ::new(__p) _Tp(__val); }
void
destroy(pointer __p) { __p->~_Tp(); }

6
libstdc++-v3/include/bits/allocator_traits.h
View File

@ -149,9 +149,11 @@ namespace std
size_type
max_size() const throw() { return size_t(-1) / sizeof(_Tp); }
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 402. wrong new expression in [some_]allocator::construct
void
construct(pointer __p, const _Tp& __val) { new(__p) _Tp(__val); }
construct(pointer __p, const _Tp& __val) { ::new(__p) _Tp(__val); }
void
destroy(pointer __p) { __p->~_Tp(); }

12
libstdc++-v3/include/bits/stl_construct.h
View File

@ -75,7 +75,11 @@ namespace std
template <class _T1, class _T2>
inline void
_Construct(_T1* __p, const _T2& __value)
{ new (static_cast<void*>(__p)) _T1(__value); }
{
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 402. wrong new expression in [some_]allocator::construct
::new (static_cast<void*>(__p)) _T1(__value);
}
/**
* @if maint
@ -86,7 +90,11 @@ namespace std
template <class _T1>
inline void
_Construct(_T1* __p)
{ new (static_cast<void*>(__p)) _T1(); }
{
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 402. wrong new expression in [some_]allocator::construct
::new (static_cast<void*>(__p)) _T1();
}
/**
* @if maint

0
libstdc++-v3/testsuite/20_util/allocator_members.cc → libstdc++-v3/testsuite/20_util/allocator/1.cc
View File

46
libstdc++-v3/testsuite/20_util/allocator/10378.cc Normal file
View File

@ -0,0 +1,46 @@
// Copyright (C) 2003 Free Software Foundation, Inc.
//
// 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
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 2, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING. If not, write to the Free
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
// USA.
// 20.1.5 allocator requirements / 20.4.1.1 allocator members
#include <list>
#include <cstdlib>
#include <testsuite_hooks.h>
class Bob
{
public:
static void* operator new(size_t sz)
{ return std::malloc(sz); }
};
// libstdc++/10378
void test01()
{
using namespace std;
bool test __attribute__((unused)) = true;
list<Bob> uniset;
uniset.push_back(Bob());
}
int main()
{
test01();
return 0;
}