From 734f50238f863ae90d2e8caa2323aaa02380ff48 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Sat, 10 Nov 2012 12:27:22 -0500 Subject: * many: Replace uses of __GXX_EXPERIMENTAL_CXX0X__ with __cplusplus. From-SVN: r193392 --- libstdc++-v3/include/ext/vstring.h | 58 +++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'libstdc++-v3/include/ext/vstring.h') diff --git a/libstdc++-v3/include/ext/vstring.h b/libstdc++-v3/include/ext/vstring.h index 48e3d46..7e2612e 100644 --- a/libstdc++-v3/include/ext/vstring.h +++ b/libstdc++-v3/include/ext/vstring.h @@ -32,7 +32,7 @@ #pragma GCC system_header -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include #endif @@ -150,7 +150,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __versa_string(const __versa_string& __str) : __vstring_base(__str) { } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief String move constructor. * @param __str Source string. @@ -238,7 +238,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * @param __end End of range. * @param __a Allocator to use (default is default allocator). */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template> #else @@ -261,7 +261,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator=(const __versa_string& __str) { return this->assign(__str); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief String move assignment operator. * @param __str Source string. @@ -386,7 +386,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION rend() const _GLIBCXX_NOEXCEPT { return const_reverse_iterator(this->begin()); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * Returns a read-only (constant) iterator that points to the first * character in the %string. @@ -468,7 +468,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION resize(size_type __n) { this->resize(__n, _CharT()); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /// A non-binding request to reduce capacity() to size(). void shrink_to_fit() @@ -604,7 +604,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return this->_M_data()[__n]; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * Returns a read/write reference to the data at the first * element of the %string. @@ -669,7 +669,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return *this; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Append an initializer_list of characters. * @param __l The initializer_list of characters to be appended. @@ -678,7 +678,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __versa_string& operator+=(std::initializer_list<_CharT> __l) { return this->append(__l.begin(), __l.end()); } -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 /** * @brief Append a string to this string. @@ -748,7 +748,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION append(size_type __n, _CharT __c) { return _M_replace_aux(this->size(), size_type(0), __n, __c); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Append an initializer_list of characters. * @param __l The initializer_list of characters to append. @@ -757,7 +757,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __versa_string& append(std::initializer_list<_CharT> __l) { return this->append(__l.begin(), __l.end()); } -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 /** * @brief Append a range of characters. @@ -767,7 +767,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * * Appends characters in the range [first,last) to this string. */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template> #else @@ -803,7 +803,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return *this; } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Set value to contents of another string. * @param __str Source string to use. @@ -818,7 +818,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION this->swap(__str); return *this; } -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 /** * @brief Set value to a substring of a string. @@ -896,7 +896,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * Sets value of string to characters in the range * [first,last). */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template> #else @@ -906,7 +906,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION assign(_InputIterator __first, _InputIterator __last) { return this->replace(_M_ibegin(), _M_iend(), __first, __last); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Set value to an initializer_list of characters. * @param __l The initializer_list of characters to assign. @@ -915,7 +915,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __versa_string& assign(std::initializer_list<_CharT> __l) { return this->assign(__l.begin(), __l.end()); } -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 /** * @brief Insert multiple characters. @@ -946,7 +946,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * thrown. The value of the string doesn't change if an error * is thrown. */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template> #else @@ -956,7 +956,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION insert(iterator __p, _InputIterator __beg, _InputIterator __end) { this->replace(__p, __p, __beg, __end); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Insert an initializer_list of characters. * @param __p Iterator referencing location in string to insert at. @@ -966,7 +966,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION void insert(iterator __p, std::initializer_list<_CharT> __l) { this->insert(__p, __l.begin(), __l.end()); } -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 /** * @brief Insert value of a string. @@ -1160,7 +1160,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return iterator(this->_M_data() + __pos); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Remove the last character. * @@ -1169,7 +1169,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION void pop_back() { this->_M_erase(size()-1, 1); } -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 /** * @brief Replace characters with value from another string. @@ -1387,7 +1387,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * of result exceeds max_size(), length_error is thrown. The * value of the string doesn't change if an error is thrown. */ -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template> __versa_string& @@ -1458,7 +1458,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __k1.base(), __k2 - __k1); } -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L /** * @brief Replace range of characters with initializer_list. * @param __i1 Iterator referencing start of range to replace. @@ -1475,7 +1475,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __versa_string& replace(iterator __i1, iterator __i2, std::initializer_list<_CharT> __l) { return this->replace(__i1, __i2, __l.begin(), __l.end()); } -#endif // __GXX_EXPERIMENTAL_CXX0X__ +#endif // C++11 private: template @@ -2159,7 +2159,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION operator+(const __versa_string<_CharT, _Traits, _Alloc, _Base>& __lhs, _CharT __rhs); -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L template class _Base> inline __versa_string<_CharT, _Traits, _Alloc, _Base> @@ -2572,7 +2572,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION } // namespace -#if (defined(__GXX_EXPERIMENTAL_CXX0X__) && defined(_GLIBCXX_USE_C99)) +#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99)) #include @@ -2790,7 +2790,7 @@ _GLIBCXX_END_NAMESPACE_VERSION #endif -#ifdef __GXX_EXPERIMENTAL_CXX0X__ +#if __cplusplus >= 201103L #include @@ -2848,7 +2848,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION } // namespace -#endif /* __GXX_EXPERIMENTAL_CXX0X__ */ +#endif // C++11 #include "vstring.tcc" -- cgit v1.1