summaryrefslogtreecommitdiffstats
path: root/libstdc++-v3/include/ext/algorithm
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2007-10-14 21:17:23 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2007-10-14 21:17:23 +0000
commitf9cdaf4bd093f2284cf785c9c718b93c0548b249 (patch)
tree8fde0a4c243d36b17d1790b5131fc7591488d023 /libstdc++-v3/include/ext/algorithm
parent366f17edd85893ad1057933b226660f95f18a878 (diff)
downloadppe42-gcc-f9cdaf4bd093f2284cf785c9c718b93c0548b249.tar.gz
ppe42-gcc-f9cdaf4bd093f2284cf785c9c718b93c0548b249.zip
2007-10-14 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_algo.h (is_sorted, is_sorted_until): Add. * include/bits/algorithmfwd.h: Add. * include/ext/algorithm: Adjust. * testsuite/25_algorithms/is_sorted/requirements/ explicit_instantiation/2.cc: New. * testsuite/25_algorithms/is_sorted/requirements/ explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/is_sorted/1.cc: Likewise. * testsuite/25_algorithms/is_sorted_until/requirements/ explicit_instantiation/2.cc: Likewise. * testsuite/25_algorithms/is_sorted_until/requirements/ explicit_instantiation/pod.cc: Likewise. * testsuite/25_algorithms/is_sorted_until/1.cc: Likewise. * testsuite/25_algorithms/headers/algorithm/synopsis.cc: Add is_sorted and is_sorted_until. * include/bits/stl_heap.h (is_heap_until): Add concept and debug-mode checks. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@129303 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/ext/algorithm')
-rw-r--r--libstdc++-v3/include/ext/algorithm5
1 files changed, 5 insertions, 0 deletions
diff --git a/libstdc++-v3/include/ext/algorithm b/libstdc++-v3/include/ext/algorithm
index 10ca58aa2fd..5a24b7e6f48 100644
--- a/libstdc++-v3/include/ext/algorithm
+++ b/libstdc++-v3/include/ext/algorithm
@@ -428,6 +428,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
__out_last - __out_first);
}
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+ using std::is_heap;
+ using std::is_sorted;
+#else
/**
* This is an SGI extension.
* @ingroup SGIextensions
@@ -523,6 +527,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
return false;
return true;
}
+#endif
_GLIBCXX_END_NAMESPACE
OpenPOWER on IntegriCloud