r172074 - in /branches/gcc-4_6-branch: ./ libst...

[jyasskin at gcc dot gnu dot org]

Author: jyasskin
Date: Thu Apr  7 04:50:23 2011
New Revision: 172074

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=172074
Log:
Merge r172073 from trunk to the 4.6 release branch, to fix two
ambiguities between extensions and new C++0x functions.

Tested: bootstrap + make check-c++ on x86_64

libstdc++-v3/ChangeLog:

2011-04-06  Jeffrey Yasskin  <jyasskin@google.com>

	* include/ext/algorithm (is_sorted): In C++0x mode import from
	namespace std.
	* include/ext/numeric (iota): In C++0x mode import from
	namespace std.
	* testsuite/ext/is_sorted/cxx0x.cc: New.
	* testsuite/ext/iota/cxx0x.cc: New.


Added:
    branches/gcc-4_6-branch/libstdc++-v3/testsuite/ext/iota/
      - copied from r172073, trunk/libstdc++-v3/testsuite/ext/iota/
    branches/gcc-4_6-branch/libstdc++-v3/testsuite/ext/is_sorted/
      - copied from r172073, trunk/libstdc++-v3/testsuite/ext/is_sorted/
Modified:
    branches/gcc-4_6-branch/libstdc++-v3/ChangeLog
    branches/gcc-4_6-branch/libstdc++-v3/include/ext/algorithm
    branches/gcc-4_6-branch/libstdc++-v3/include/ext/numeric

Changes in other areas also in this revision:
Modified:
    branches/gcc-4_6-branch/   (props changed)

Propchange: branches/gcc-4_6-branch/
            ('svn:mergeinfo' added)