summaryrefslogtreecommitdiffstats
path: root/libstdc++-v3/include/ext/algorithm
diff options
context:
space:
mode:
authorjyasskin <jyasskin@138bc75d-0d04-0410-961f-82ee72b054a4>2011-04-07 04:11:12 +0000
committerjyasskin <jyasskin@138bc75d-0d04-0410-961f-82ee72b054a4>2011-04-07 04:11:12 +0000
commit3dacfcad47a1e6dba0f2e4618f71f7d5310b0ede (patch)
treef92cd6d3626cf4f136bce1ba2332932aae9bdace /libstdc++-v3/include/ext/algorithm
parenta4ba603a393924431480d9b6f736805669dc4e10 (diff)
downloadppe42-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/algorithm')
-rw-r--r--libstdc++-v3/include/ext/algorithm4
1 files changed, 4 insertions, 0 deletions
diff --git a/libstdc++-v3/include/ext/algorithm b/libstdc++-v3/include/ext/algorithm
index 368b5918058..417a03ab97c 100644
--- a/libstdc++-v3/include/ext/algorithm
+++ b/libstdc++-v3/include/ext/algorithm
@@ -471,6 +471,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
#endif
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+ using std::is_sorted;
+#else
// is_sorted, a predicated testing whether a range is sorted in
// nondescending order. This is an extension, not part of the C++
// standard.
@@ -526,6 +529,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return false;
return true;
}
+#endif // __GXX_EXPERIMENTAL_CXX0X__
/**
* @brief Find the median of three values.
OpenPOWER on IntegriCloud