From 0960c06de74c8d5435dd08461caa19370382b459 Mon Sep 17 00:00:00 2001 From: paolo Date: Sat, 27 Oct 2007 12:07:04 +0000 Subject: 2007-10-27 Paolo Carlini * include/bits/stl_algobase.h (struct __miter_base): Add. (__copy_move_a2, __copy_move_backward_a2): Add. (copy, copy_backward, move, move_backward): Adjust, call *a2 helpers. * include/bits/cpp_type_traits.h (struct __is_move_iterator): Add. * include/bits/streambuf_iterator.h (__copy_move_a<>): Rename to __copy_move_a2. * include/std/streambuf (friend __copy_move_a<>): Likewise. * testsuite/25_algorithms/copy/move_iterators/1.cc: New. * testsuite/25_algorithms/copy_backward/move_iterators/1.cc: Likewise. * include/bits/stl_iterator.h (__normal_iterator<>::_Iterator_type): Rename to iterator_type. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@129678 138bc75d-0d04-0410-961f-82ee72b054a4 --- .../25_algorithms/copy/move_iterators/1.cc | 66 +++++++++++++++++++++ .../copy_backward/move_iterators/1.cc | 68 ++++++++++++++++++++++ 2 files changed, 134 insertions(+) create mode 100644 libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/1.cc create mode 100644 libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/1.cc (limited to 'libstdc++-v3/testsuite/25_algorithms') diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/1.cc b/libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/1.cc new file mode 100644 index 00000000000..c8f349435cb --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/1.cc @@ -0,0 +1,66 @@ +// { 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::output_iterator_wrapper; +using __gnu_test::rvalstruct; +using std::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); + + 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/25_algorithms/copy_backward/move_iterators/1.cc b/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/1.cc new file mode 100644 index 00000000000..e99b9e78f0e --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/1.cc @@ -0,0 +1,68 @@ +// { 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::bidirectional_iterator_wrapper; +using __gnu_test::rvalstruct; +using std::copy_backward; + +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); + std::fill(out, out + size, 0); + + container_in incon(in, in + size); + container_out outcon(out, out + size); + + copy_backward(std::move_iterator >(incon.begin()), + std::move_iterator >(incon.end()), + outcon.end()); + 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; +} -- cgit v1.2.1