diff options
| author | avieira <avieira@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-06-22 14:59:21 +0000 |
|---|---|---|
| committer | avieira <avieira@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-06-22 14:59:21 +0000 |
| commit | 6a298aa6205bdcd75ed64e7a6fed9dd03c65db17 (patch) | |
| tree | d887d893f39d16e4990a853d3398dfc48433430f /libstdc++-v3/include/bits/char_traits.h | |
| parent | 08de971a04b3432ec9323b1cafdd9ff5a28e0efb (diff) | |
| parent | 33c4d56ec8b65b998b1a6751e19e3005f1bc401e (diff) | |
Merge from gcc-7-branch.ARM/embedded-7-branch-2018q2ARM/embedded-7-branch
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/ARM/embedded-7-branch@261903 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits/char_traits.h')
| -rw-r--r-- | libstdc++-v3/include/bits/char_traits.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h index 3ecc30e46cb..791608ad3db 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. |