stl_uninitialized.h (uninitialized_copy): Use ::new and value_type per the letter...
authorPaolo Carlini <pcarlini@suse.de>
Sun, 28 Oct 2007 16:03:06 +0000 (16:03 +0000)
committerPaolo Carlini <paolo@gcc.gnu.org>
Sun, 28 Oct 2007 16:03:06 +0000 (16:03 +0000)
2007-10-28  Paolo Carlini  <pcarlini@suse.de>

* 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
libstdc++-v3/include/bits/stl_construct.h
libstdc++-v3/include/bits/stl_uninitialized.h
libstdc++-v3/testsuite/20_util/specialized_algorithms/16505.cc [deleted file]
libstdc++-v3/testsuite/20_util/specialized_algorithms/32158.cc [deleted file]
libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/move_iterators/1.cc [new file with mode: 0644]
libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_fill/32158.cc [new file with mode: 0644]
libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_fill_n/16505.cc [new file with mode: 0644]

index cd2acd92f4850f21fd4789a097d72feaf77984f4..aa276488e2aa0ac82404fcf5b60d3e58ce2ac934 100644 (file)
@@ -1,3 +1,19 @@
+2007-10-28  Paolo Carlini  <pcarlini@suse.de>
+
+       * 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  <pcarlini@suse.de>
 
        * include/bits/stl_algobase.h (struct __miter_base): Add.
index 188efa927816995bba8ef87e8c7089431349e2a8..460383424a6046319169d3048e893e7b94b9ff1b 100644 (file)
@@ -81,21 +81,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       ::new(static_cast<void*>(__p)) _T1(__value);
     }
 
-  /**
-   * @if maint
-   * Constructs an object in existing memory by invoking an allocated
-   * object's default constructor (no initializers).
-   * @endif
-   */
-  template<typename _T1>
-    inline void
-    _Construct(_T1* __p)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 402. wrong new expression in [some_]allocator::construct
-      ::new(static_cast<void*>(__p)) _T1();
-    }
-
   /**
    * @if maint
    * Destroy the object pointed to by a pointer type.
index c564c21e3fd04987b9aa33bc277e1e0e976d5cd3..d3e7a2c8c3f64663c9e0fa93dead05be95e0e510 100644 (file)
@@ -76,7 +76,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
          try
            {
              for (; __first != __last; ++__first, ++__cur)
-               std::_Construct(&*__cur, *__first);
+               ::new(static_cast<void*>(&*__cur)) typename
+                   iterator_traits<_ForwardIterator>::value_type(*__first);
              return __cur;
            }
          catch(...)
diff --git a/libstdc++-v3/testsuite/20_util/specialized_algorithms/16505.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/16505.cc
deleted file mode 100644 (file)
index b20c049..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (C) 2004 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// 20.4.4 specialized algorithms
-
-// { dg-do compile }
-
-#include <memory>
-
-// libstdc++/16505
-
-struct S { };
-
-template
-  void
-  std::uninitialized_fill_n<S*, int, S>(S*, int, const S&);
diff --git a/libstdc++-v3/testsuite/20_util/specialized_algorithms/32158.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/32158.cc
deleted file mode 100644 (file)
index 1f9867e..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-// 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 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// 20.4.4 specialized algorithms
-
-// { dg-do compile }
-
-#include <memory>
-#include <utility>
-
-// c++/32158
-
-typedef std::pair<const int, int> MyPair;
-
-void
-Alpha(MyPair* start, MyPair* end)
-{
-  MyPair my_pair(1, 2);
-  std::uninitialized_fill(start, end, my_pair);
-};
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 (file)
index 0000000..11e07a7
--- /dev/null
@@ -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 <algorithm>
+#include <iterator>
+#include <testsuite_hooks.h>
+#include <testsuite_iterators.h>
+#include <testsuite_rvalref.h>
+
+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<rvalstruct, input_iterator_wrapper> container_in;
+typedef test_container<rvalstruct, forward_iterator_wrapper> 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<input_iterator_wrapper<rvalstruct> >(incon.begin()),
+                    std::move_iterator<input_iterator_wrapper<rvalstruct> >(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/uninitialized_fill/32158.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_fill/32158.cc
new file mode 100644 (file)
index 0000000..1f9867e
--- /dev/null
@@ -0,0 +1,35 @@
+// 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 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// 20.4.4 specialized algorithms
+
+// { dg-do compile }
+
+#include <memory>
+#include <utility>
+
+// c++/32158
+
+typedef std::pair<const int, int> MyPair;
+
+void
+Alpha(MyPair* start, MyPair* end)
+{
+  MyPair my_pair(1, 2);
+  std::uninitialized_fill(start, end, my_pair);
+};
diff --git a/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_fill_n/16505.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_fill_n/16505.cc
new file mode 100644 (file)
index 0000000..b20c049
--- /dev/null
@@ -0,0 +1,31 @@
+// Copyright (C) 2004 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// 20.4.4 specialized algorithms
+
+// { dg-do compile }
+
+#include <memory>
+
+// libstdc++/16505
+
+struct S { };
+
+template
+  void
+  std::uninitialized_fill_n<S*, int, S>(S*, int, const S&);