From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 6 Oct 2021 19:03:50 +0000 (+0100)
Subject: libstdc++: Use more descriptive feature test macro
X-Git-Tag: upstream/12.2.0~4294
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d95867ce6867239aa4ae69a9c82915660e1071d;p=platform%2Fupstream%2Fgcc.git

libstdc++: Use more descriptive feature test macro

The out-of-class definitions of the static constants are redundant if
the __cpp_inline_variables feature is supported, so use that macro to
decide whether to define them or not.

libstdc++-v3/ChangeLog:

	* include/bits/regex.h: Check __cpp_inline_variables instead of
	__cplusplus.
---

diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h
index a399018..785edc7 100644
--- a/libstdc++-v3/include/bits/regex.h
+++ b/libstdc++-v3/include/bits/regex.h
@@ -807,7 +807,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
       _AutomatonPtr	_M_automaton;
     };
 
-#if __cplusplus < 201703L
+#if ! __cpp_inline_variables
   template<typename _Ch, typename _Tr>
     constexpr regex_constants::syntax_option_type
     basic_regex<_Ch, _Tr>::icase;