diff options
| author | jyasskin <jyasskin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-04-07 04:11:12 +0000 |
|---|---|---|
| committer | jyasskin <jyasskin@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-04-07 04:11:12 +0000 |
| commit | 3dacfcad47a1e6dba0f2e4618f71f7d5310b0ede (patch) | |
| tree | f92cd6d3626cf4f136bce1ba2332932aae9bdace /libstdc++-v3/include/ext/numeric | |
| parent | a4ba603a393924431480d9b6f736805669dc4e10 (diff) | |
| download | ppe42-gcc-3dacfcad47a1e6dba0f2e4618f71f7d5310b0ede.tar.gz ppe42-gcc-3dacfcad47a1e6dba0f2e4618f71f7d5310b0ede.zip | |
In C++0x mode, import iota and is_sorted from namespace std into
namespace __gnu_cxx to avoid ambiguous call errors. copy_n would be a
good candidate for this too, except it was standardized with a
different return type.
Tested:
`make -k check-c++` on x86_64-unknown-linux-gnu.
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@172073 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/ext/numeric')
| -rw-r--r-- | libstdc++-v3/include/ext/numeric | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libstdc++-v3/include/ext/numeric b/libstdc++-v3/include/ext/numeric index d4a367fca52..b389177f374 100644 --- a/libstdc++-v3/include/ext/numeric +++ b/libstdc++-v3/include/ext/numeric @@ -123,6 +123,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION power(_Tp __x, _Integer __n) { return __power(__x, __n); } +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + using std::iota; +#else /** * This is an SGI extension. * @ingroup SGIextensions @@ -141,9 +144,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION while (__first != __last) *__first++ = __value++; } +#endif // __GXX_EXPERIMENTAL_CXX0X__ _GLIBCXX_END_NAMESPACE_VERSION } // namespace #endif - |
