From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Fri, 19 Feb 2010 17:38:18 +0000 (+0000)
Subject: stl_algo.h (for_each): Implement resolution of DR 1110.
X-Git-Tag: releases/gcc-4.5.0~703
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=488d283713843caec66bb4978540ebf4fe61e119;p=thirdparty%2Fgcc.git

stl_algo.h (for_each): Implement resolution of DR 1110.

2010-02-19  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/stl_algo.h (for_each): Implement resolution of DR 1110.
	* testsuite/25_algorithms/for_each/1.cc: New.

From-SVN: r156900
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e75016ca7a32..e85c5383a7a7 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-19  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* include/bits/stl_algo.h (for_each): Implement resolution of DR 1110.
+	* testsuite/25_algorithms/for_each/1.cc: New.
+
 2010-02-19  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/bits/shared_ptr_base.h (__weak_ptr): Remove deleted
diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index 6da898b35489..60caa4362066 100644
--- a/libstdc++-v3/include/bits/stl_algo.h
+++ b/libstdc++-v3/include/bits/stl_algo.h
@@ -4191,7 +4191,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P)
    *  @param  first  An input iterator.
    *  @param  last   An input iterator.
    *  @param  f      A unary function object.
-   *  @return   @p f.
+   *  @return   @p f (std::move(@p f) in C++0x).
    *
    *  Applies the function object @p f to each element in the range
    *  @p [first,last).  @p f must not modify the order of the sequence.
@@ -4206,7 +4206,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_P)
       __glibcxx_requires_valid_range(__first, __last);
       for (; __first != __last; ++__first)
 	__f(*__first);
-      return __f;
+      return _GLIBCXX_MOVE(__f);
     }
 
   /**
diff --git a/libstdc++-v3/testsuite/25_algorithms/for_each/1.cc b/libstdc++-v3/testsuite/25_algorithms/for_each/1.cc
new file mode 100644
index 000000000000..4cfd3e89f304
--- /dev/null
+++ b/libstdc++-v3/testsuite/25_algorithms/for_each/1.cc
@@ -0,0 +1,67 @@
+// { dg-options "-std=gnu++0x" }
+
+// 2010-02-19  Paolo Carlini  <paolo.carlini@oracle.com>
+
+// Copyright (C) 2010 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/>.
+
+// XXX FIXME:  parallel-mode should deal correctly with moveable-only types
+// per C++0x, at minimum smoothly fall back to serial.
+#undef _GLIBCXX_PARALLEL
+
+#include <algorithm>
+#include <testsuite_hooks.h>
+#include <testsuite_iterators.h>
+
+struct Function
+{
+  Function() : tot(0) { }
+  Function(Function&& f) : tot(f.tot) { f.tot = 0; }
+
+  Function(const Function&) = delete;
+
+  void operator()(int num)
+  { tot += num; }
+
+  int get() { return tot; }
+
+private:
+  int tot;
+};
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using __gnu_test::test_container;
+  using __gnu_test::input_iterator_wrapper;
+
+  typedef test_container<int, input_iterator_wrapper> Container;
+
+  int array[5] = { 1, 2, 3, 4, 5 };
+  Container con(array, array + 5);
+
+  Function f;
+  Function f_res = std::for_each(con.begin(), con.end(), std::move(f));
+
+  VERIFY( f_res.get() == 15 );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}