From: Jonathan Wakely Date: Thu, 20 Oct 2016 10:13:10 +0000 (+0100) Subject: PR78052 Define std::allocator::{construct,destroy} X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1d6360c85b896e69ac0075110a190a27cc1e5c39;p=gcc.git PR78052 Define std::allocator::{construct,destroy} PR libstdc++/78052 * include/bits/allocator.h (allocator::construct) (allocator::destroy): Define. * testsuite/20_util/allocator/void.cc: New test. From-SVN: r241365 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 340a7f6bfe3..cca33773dee 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2016-10-20 Jonathan Wakely + PR libstdc++/78052 + * include/bits/allocator.h (allocator::construct) + (allocator::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 8e78165c7f0..9fb5842475d 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 + void + construct(_Up* __p, _Args&&... __args) + { ::new((void *)__p) _Up(std::forward<_Args>(__args)...); } + + template + 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 00000000000..0e47fef82b4 --- /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 +// . + +// { dg-do run { target c++11 } } + +#include +#include + +template class std::allocator; + +void +test01() +{ + int i; + using alloc_type = std::allocator; + alloc_type a; + std::allocator_traits::construct(a, &i, 42); + VERIFY( i == 42 ); + std::allocator_traits::destroy(a, &i); +} + +int +main() +{ + test01(); +}