diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2016-10-20 11:13:10 +0100 |
---|---|---|
committer | Jonathan Wakely <redi@gcc.gnu.org> | 2016-10-20 11:13:10 +0100 |
commit | 1d6360c85b896e69ac0075110a190a27cc1e5c39 (patch) | |
tree | 193a71f9d020f0cc829b0057f387b3fe4bddf38c | |
parent | 4f63d614fa51b4f2f28ea8d61af765c6b58b90e2 (diff) | |
download | gcc-1d6360c85b896e69ac0075110a190a27cc1e5c39.zip gcc-1d6360c85b896e69ac0075110a190a27cc1e5c39.tar.gz gcc-1d6360c85b896e69ac0075110a190a27cc1e5c39.tar.bz2 |
PR78052 Define std::allocator<void>::{construct,destroy}
PR libstdc++/78052
* include/bits/allocator.h (allocator<void>::construct)
(allocator<void>::destroy): Define.
* testsuite/20_util/allocator/void.cc: New test.
From-SVN: r241365
-rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/allocator.h | 9 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/20_util/allocator/void.cc | 40 |
3 files changed, 54 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 340a7f6..cca33773 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2016-10-20 Jonathan Wakely <jwakely@redhat.com> + PR libstdc++/78052 + * include/bits/allocator.h (allocator<void>::construct) + (allocator<void>::destroy): Define. + * testsuite/20_util/allocator/void.cc: New test. + * testsuite/20_util/enable_shared_from_this/56383.cc: Add tests for additional ambiguous cases. diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h index 8e78165..9fb5842 100644 --- a/libstdc++-v3/include/bits/allocator.h +++ b/libstdc++-v3/include/bits/allocator.h @@ -84,6 +84,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typedef true_type propagate_on_container_move_assignment; typedef true_type is_always_equal; + + template<typename _Up, typename... _Args> + void + construct(_Up* __p, _Args&&... __args) + { ::new((void *)__p) _Up(std::forward<_Args>(__args)...); } + + template<typename _Up> + void + destroy(_Up* __p) { __p->~_Up(); } #endif }; diff --git a/libstdc++-v3/testsuite/20_util/allocator/void.cc b/libstdc++-v3/testsuite/20_util/allocator/void.cc new file mode 100644 index 0000000..0e47fef --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/allocator/void.cc @@ -0,0 +1,40 @@ +// Copyright (C) 2016 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 3, 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 COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +// { dg-do run { target c++11 } } + +#include <memory> +#include <testsuite_hooks.h> + +template class std::allocator<void>; + +void +test01() +{ + int i; + using alloc_type = std::allocator<void>; + alloc_type a; + std::allocator_traits<alloc_type>::construct(a, &i, 42); + VERIFY( i == 42 ); + std::allocator_traits<alloc_type>::destroy(a, &i); +} + +int +main() +{ + test01(); +} |