diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2018-06-15 18:15:54 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2018-06-15 18:15:54 +0100 |
| commit | 20b5e17c6f6731e94e9a91958b20914f09088aea (patch) | |
| tree | 486c8d64cac57228258b2a5664b07c30f4574be4 | |
| parent | 53f37cfed5181af1885cd3a31b1ce99bdc445fa0 (diff) | |
| download | gcc-20b5e17c6f6731e94e9a91958b20914f09088aea.zip gcc-20b5e17c6f6731e94e9a91958b20914f09088aea.tar.gz gcc-20b5e17c6f6731e94e9a91958b20914f09088aea.tar.bz2 | |
Only define __cpp_lib_constexpr_char_traits for C++17
* include/bits/char_traits.h (__cpp_lib_constexpr_char_traits): Only
define for C++17 and above.
From-SVN: r261639
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/char_traits.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b7c6a28..b0306eb 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2018-06-15 Jonathan Wakely <jwakely@redhat.com> + + * include/bits/char_traits.h (__cpp_lib_constexpr_char_traits): Only + define for C++17 and above. + 2018-06-06 Jonathan Wakely <jwakely@redhat.com> PR libstdc++/86008 diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h index 51cd321..cd4f454 100644 --- a/libstdc++-v3/include/bits/char_traits.h +++ b/libstdc++-v3/include/bits/char_traits.h @@ -143,8 +143,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return !eq_int_type(__c, eof()) ? __c : to_int_type(char_type()); } }; -#define __cpp_lib_constexpr_char_traits 201611 - template<typename _CharT> _GLIBCXX14_CONSTEXPR int char_traits<_CharT>:: @@ -217,6 +215,8 @@ namespace std _GLIBCXX_VISIBILITY(default) _GLIBCXX_BEGIN_NAMESPACE_VERSION #if __cplusplus > 201402 +#define __cpp_lib_constexpr_char_traits 201611 + /** * @brief Determine whether the characters of a NULL-terminated * string are known at compile time. |