diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-02-12 21:26:21 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-02-12 21:26:21 +0000 |
| commit | 8d01b8bafb4f34db90c619eee05849c4ccecab10 (patch) | |
| tree | 9c506ccdc4ce001a34caea59236d0c71a5cd0fb7 /libstdc++-v3/include/ext/algorithm | |
| parent | c2b7e854b46e97e35e06f647c2c0e8be415cc4d4 (diff) | |
| download | ppe42-gcc-8d01b8bafb4f34db90c619eee05849c4ccecab10.tar.gz ppe42-gcc-8d01b8bafb4f34db90c619eee05849c4ccecab10.zip | |
2011-02-12 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/47709
* include/ext/algorithm (is_heap): In C++0x mode import from
namespace std.
* testsuite/ext/is_heap/47709.cc: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@170089 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/ext/algorithm')
| -rw-r--r-- | libstdc++-v3/include/ext/algorithm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/include/ext/algorithm b/libstdc++-v3/include/ext/algorithm index bfe454cecd4..368b5918058 100644 --- a/libstdc++-v3/include/ext/algorithm +++ b/libstdc++-v3/include/ext/algorithm @@ -1,6 +1,7 @@ // Algorithm extensions -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +// 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -426,6 +427,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __out_last - __out_first); } +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + using std::is_heap; +#else /** * This is an SGI extension. * @ingroup SGIextensions @@ -465,6 +469,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return std::__is_heap(__first, __comp, __last - __first); } +#endif // is_sorted, a predicated testing whether a range is sorted in // nondescending order. This is an extension, not part of the C++ |
