From e85b4fa7b56003e26a98c54247d79365b740bb6d Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sun, 28 Oct 2007 16:03:06 +0000 Subject: [PATCH] stl_uninitialized.h (uninitialized_copy): Use ::new and value_type per the letter of the standard. 2007-10-28 Paolo Carlini * include/bits/stl_uninitialized.h (uninitialized_copy): Use ::new and value_type per the letter of the standard. * testsuite/20_util/specialized_algorithms/uninitialized_copy/ move_iterators/1.cc: New. * testsuite/20_util/specialized_algorithms/16505.cc: Move to... * testsuite/20_util/specialized_algorithms/uninitialized_fill_n/ 16505.cc: ... here. * testsuite/20_util/specialized_algorithms/32158.cc: Move to... * testsuite/20_util/specialized_algorithms/uninitialized_fill/ 32158.cc: ... here. * include/bits/stl_construct.h (_Construct(_T1*)): Remove, unused. From-SVN: r129698 --- libstdc++-v3/ChangeLog | 16 +++++ libstdc++-v3/include/bits/stl_construct.h | 15 ----- libstdc++-v3/include/bits/stl_uninitialized.h | 3 +- .../uninitialized_copy/move_iterators/1.cc | 67 +++++++++++++++++++ .../{ => uninitialized_fill}/32158.cc | 0 .../{ => uninitialized_fill_n}/16505.cc | 0 6 files changed, 85 insertions(+), 16 deletions(-) create mode 100644 libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/move_iterators/1.cc rename libstdc++-v3/testsuite/20_util/specialized_algorithms/{ => uninitialized_fill}/32158.cc (100%) rename libstdc++-v3/testsuite/20_util/specialized_algorithms/{ => uninitialized_fill_n}/16505.cc (100%) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cd2acd92f48..aa276488e2a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,19 @@ +2007-10-28 Paolo Carlini + + * include/bits/stl_uninitialized.h (uninitialized_copy): Use + ::new and value_type per the letter of the standard. + * testsuite/20_util/specialized_algorithms/uninitialized_copy/ + move_iterators/1.cc: New. + + * testsuite/20_util/specialized_algorithms/16505.cc: Move to... + * testsuite/20_util/specialized_algorithms/uninitialized_fill_n/ + 16505.cc: ... here. + * testsuite/20_util/specialized_algorithms/32158.cc: Move to... + * testsuite/20_util/specialized_algorithms/uninitialized_fill/ + 32158.cc: ... here. + + * include/bits/stl_construct.h (_Construct(_T1*)): Remove, unused. + 2007-10-27 Paolo Carlini * include/bits/stl_algobase.h (struct __miter_base): Add. diff --git a/libstdc++-v3/include/bits/stl_construct.h b/libstdc++-v3/include/bits/stl_construct.h index 188efa92781..460383424a6 100644 --- a/libstdc++-v3/include/bits/stl_construct.h +++ b/libstdc++-v3/include/bits/stl_construct.h @@ -81,21 +81,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ::new(static_cast(__p)) _T1(__value); } - /** - * @if maint - * Constructs an object in existing memory by invoking an allocated - * object's default constructor (no initializers). - * @endif - */ - template - inline void - _Construct(_T1* __p) - { - // _GLIBCXX_RESOLVE_LIB_DEFECTS - // 402. wrong new expression in [some_]allocator::construct - ::new(static_cast(__p)) _T1(); - } - /** * @if maint * Destroy the object pointed to by a pointer type. diff --git a/libstdc++-v3/include/bits/stl_uninitialized.h b/libstdc++-v3/include/bits/stl_uninitialized.h index c564c21e3fd..d3e7a2c8c3f 100644 --- a/libstdc++-v3/include/bits/stl_uninitialized.h +++ b/libstdc++-v3/include/bits/stl_uninitialized.h @@ -76,7 +76,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) try { for (; __first != __last; ++__first, ++__cur) - std::_Construct(&*__cur, *__first); + ::new(static_cast(&*__cur)) typename + iterator_traits<_ForwardIterator>::value_type(*__first); return __cur; } catch(...) diff --git a/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/move_iterators/1.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/move_iterators/1.cc new file mode 100644 index 00000000000..11e07a76aea --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/move_iterators/1.cc @@ -0,0 +1,67 @@ +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2007 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 Pred 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. + +#undef _GLIBCXX_CONCEPT_CHECKS +#define _GLIBCXX_TESTSUITE_ALLOW_RVALREF_ALIASING + +#include +#include +#include +#include +#include + +using __gnu_test::test_container; +using __gnu_test::input_iterator_wrapper; +using __gnu_test::forward_iterator_wrapper; +using __gnu_test::rvalstruct; +using std::uninitialized_copy; + +typedef test_container container_in; +typedef test_container container_out; + +void test01() +{ + bool test __attribute__((unused)) = true; + + int inarray[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; + const int size = sizeof(inarray) / sizeof(int); + + rvalstruct in[size], out[size]; + std::copy(inarray, inarray + size, in); + + container_in incon(in, in + size); + container_out outcon(out, out + size); + + uninitialized_copy(std::move_iterator >(incon.begin()), + std::move_iterator >(incon.end()), + outcon.begin()); + VERIFY( std::equal(out, out + size, inarray) ); + for (int z = 0; z < size; ++z) + VERIFY( out[z].valid ); + for (int z = 0; z < size; ++z) + VERIFY( !in[z].valid ); +} + + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/20_util/specialized_algorithms/32158.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_fill/32158.cc similarity index 100% rename from libstdc++-v3/testsuite/20_util/specialized_algorithms/32158.cc rename to libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_fill/32158.cc diff --git a/libstdc++-v3/testsuite/20_util/specialized_algorithms/16505.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_fill_n/16505.cc similarity index 100% rename from libstdc++-v3/testsuite/20_util/specialized_algorithms/16505.cc rename to libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_fill_n/16505.cc -- 2.30.2