diff options
Diffstat (limited to 'gcc-4.4.3/libstdc++-v3/include/ext')
| -rw-r--r-- | gcc-4.4.3/libstdc++-v3/include/ext/algorithm | 4 | ||||
| -rw-r--r-- | gcc-4.4.3/libstdc++-v3/include/ext/vstring.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gcc-4.4.3/libstdc++-v3/include/ext/algorithm b/gcc-4.4.3/libstdc++-v3/include/ext/algorithm index 3337d6c07..4cd1dae80 100644 --- a/gcc-4.4.3/libstdc++-v3/include/ext/algorithm +++ b/gcc-4.4.3/libstdc++-v3/include/ext/algorithm @@ -423,6 +423,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) __out_last - __out_first); } +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + using std::is_heap; +#else /** * This is an SGI extension. * @ingroup SGIextensions @@ -462,6 +465,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) 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++ diff --git a/gcc-4.4.3/libstdc++-v3/include/ext/vstring.h b/gcc-4.4.3/libstdc++-v3/include/ext/vstring.h index 6377ca57d..a259d23fa 100644 --- a/gcc-4.4.3/libstdc++-v3/include/ext/vstring.h +++ b/gcc-4.4.3/libstdc++-v3/include/ext/vstring.h @@ -167,7 +167,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) * string. */ __versa_string(__versa_string&& __str) - : __vstring_base(std::forward<__vstring_base>(__str)) { } + : __vstring_base(std::move(__str)) { } /** * @brief Construct string from an initializer list. @@ -1454,11 +1454,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) * constant time. */ void -#ifdef __GXX_EXPERIMENTAL_CXX0X__ - swap(__versa_string&& __s) -#else swap(__versa_string& __s) -#endif { this->_M_swap(__s); } // String operations: |