OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Paolo Carlini 2010-02-19 17:38:18 +00:00 committed by Paolo Carlini
parent c7da035453
commit 488d283713
3 changed files with 74 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -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

4
libstdc++-v3/include/bits/stl_algo.h
View File

@ -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);
}
/**

67
libstdc++-v3/testsuite/25_algorithms/for_each/1.cc Normal file
View File

@ -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;
}