diff options
author | Edward Smith-Rowland <3dw4rd@verizon.net> | 2013-10-23 00:12:36 +0000 |
---|---|---|
committer | Edward Smith-Rowland <emsr@gcc.gnu.org> | 2013-10-23 00:12:36 +0000 |
commit | e9a6449215a18a8d68e97e96776410fca4777099 (patch) | |
tree | cc678f5888ddd1cfaa4daf246400cb082bce5a34 | |
parent | ae5543e66213b694f07474cc98fba9d4c5b0defc (diff) | |
download | gcc-e9a6449215a18a8d68e97e96776410fca4777099.zip gcc-e9a6449215a18a8d68e97e96776410fca4777099.tar.gz gcc-e9a6449215a18a8d68e97e96776410fca4777099.tar.bz2 |
basic_string.h (operator""s): Remove space between quotes and literal identifier.
2013-10-22 Edward Smith-Rowland <3dw4rd@verizon.net>
* include/bits/basic_string.h (operator""s): Remove space between quotes
and literal identifier.
* include/std/chrono (operator""h, operator""min, operator""s,
operator""ms, operator""us, operator""ns): Ditto.
From-SVN: r203941
-rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/basic_string.h | 8 | ||||
-rw-r--r-- | libstdc++-v3/include/std/chrono | 24 |
3 files changed, 23 insertions, 16 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f3f7c4b..b287bf1 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2013-10-22 Edward Smith-Rowland <3dw4rd@verizon.net> + + * include/bits/basic_string.h (operator""s): Remove space between quotes + and literal identifier. + * include/std/chrono (operator""h, operator""min, operator""s, + operator""ms, operator""us, operator""ns): Ditto. + 2013-10-22 Ed Smith-Rowland <3dw4rd@verizon.net> Implement N3779 - User-defined Literals for std::complex, diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index db01eb7..2d3edf8 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -3130,22 +3130,22 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { inline basic_string<char> - operator"" s(const char* __str, size_t __len) + operator""s(const char* __str, size_t __len) { return basic_string<char>{__str, __len}; } #ifdef _GLIBCXX_USE_WCHAR_T inline basic_string<wchar_t> - operator"" s(const wchar_t* __str, size_t __len) + operator""s(const wchar_t* __str, size_t __len) { return basic_string<wchar_t>{__str, __len}; } #endif #ifdef _GLIBCXX_USE_C99_STDINT_TR1 inline basic_string<char16_t> - operator"" s(const char16_t* __str, size_t __len) + operator""s(const char16_t* __str, size_t __len) { return basic_string<char16_t>{__str, __len}; } inline basic_string<char32_t> - operator"" s(const char32_t* __str, size_t __len) + operator""s(const char32_t* __str, size_t __len) { return basic_string<char32_t>{__str, __len}; } #endif diff --git a/libstdc++-v3/include/std/chrono b/libstdc++-v3/include/std/chrono index d5ef984..deeb460 100644 --- a/libstdc++-v3/include/std/chrono +++ b/libstdc++-v3/include/std/chrono @@ -810,14 +810,14 @@ _GLIBCXX_END_NAMESPACE_VERSION } // __select_type constexpr chrono::duration<long double, ratio<3600,1>> - operator"" h(long double __hours) + operator""h(long double __hours) { return chrono::duration<long double, ratio<3600,1>>{__hours}; } template <char... _Digits> constexpr typename __select_type::_Select_type<__select_int::_Select_int<_Digits...>::value, chrono::hours>::type - operator"" h() + operator""h() { return __select_type::_Select_type< __select_int::_Select_int<_Digits...>::value, @@ -825,14 +825,14 @@ _GLIBCXX_END_NAMESPACE_VERSION } constexpr chrono::duration<long double, ratio<60,1>> - operator"" min(long double __mins) + operator""min(long double __mins) { return chrono::duration<long double, ratio<60,1>>{__mins}; } template <char... _Digits> constexpr typename __select_type::_Select_type<__select_int::_Select_int<_Digits...>::value, chrono::minutes>::type - operator"" min() + operator""min() { return __select_type::_Select_type< __select_int::_Select_int<_Digits...>::value, @@ -840,14 +840,14 @@ _GLIBCXX_END_NAMESPACE_VERSION } constexpr chrono::duration<long double> - operator"" s(long double __secs) + operator""s(long double __secs) { return chrono::duration<long double>{__secs}; } template <char... _Digits> constexpr typename __select_type::_Select_type<__select_int::_Select_int<_Digits...>::value, chrono::seconds>::type - operator"" s() + operator""s() { return __select_type::_Select_type< __select_int::_Select_int<_Digits...>::value, @@ -855,14 +855,14 @@ _GLIBCXX_END_NAMESPACE_VERSION } constexpr chrono::duration<long double, milli> - operator"" ms(long double __msecs) + operator""ms(long double __msecs) { return chrono::duration<long double, milli>{__msecs}; } template <char... _Digits> constexpr typename __select_type::_Select_type<__select_int::_Select_int<_Digits...>::value, chrono::milliseconds>::type - operator"" ms() + operator""ms() { return __select_type::_Select_type< __select_int::_Select_int<_Digits...>::value, @@ -870,14 +870,14 @@ _GLIBCXX_END_NAMESPACE_VERSION } constexpr chrono::duration<long double, micro> - operator"" us(long double __usecs) + operator""us(long double __usecs) { return chrono::duration<long double, micro>{__usecs}; } template <char... _Digits> constexpr typename __select_type::_Select_type<__select_int::_Select_int<_Digits...>::value, chrono::microseconds>::type - operator"" us() + operator""us() { return __select_type::_Select_type< __select_int::_Select_int<_Digits...>::value, @@ -885,14 +885,14 @@ _GLIBCXX_END_NAMESPACE_VERSION } constexpr chrono::duration<long double, nano> - operator"" ns(long double __nsecs) + operator""ns(long double __nsecs) { return chrono::duration<long double, nano>{__nsecs}; } template <char... _Digits> constexpr typename __select_type::_Select_type<__select_int::_Select_int<_Digits...>::value, chrono::nanoseconds>::type - operator"" ns() + operator""ns() { return __select_type::_Select_type< __select_int::_Select_int<_Digits...>::value, |