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: r261637

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index de8f0dab995e3606f50e85bd07694c9197688e7e..af164a37e964940f080d1ac8bd57b58f2ffd5943 100644 (file)
--- 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-05-17  Jonathan Wakely  <jwakely@redhat.com>
 
        PR libstdc++/85812

diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h
index 3ecc30e46cb5515f8a055b0af349fc1dd2a2ee55..791608ad3db71793d17dd03871afcab3787df6c3 100644 (file)
--- 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.