From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 6569C3858C2C; Thu, 14 Oct 2021 14:12:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6569C3858C2C MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-4403] libstdc++: Use more descriptive feature test macro X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 62b505a4d5fc8916867e25ed86dfb865fca81511 X-Git-Newrev: 3d95867ce6867239aa4ae69a9c82915660e1071d Message-Id: <20211014141248.6569C3858C2C@sourceware.org> Date: Thu, 14 Oct 2021 14:12:48 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Oct 2021 14:12:48 -0000 https://gcc.gnu.org/g:3d95867ce6867239aa4ae69a9c82915660e1071d commit r12-4403-g3d95867ce6867239aa4ae69a9c82915660e1071d Author: Jonathan Wakely Date: Wed Oct 6 20:03:50 2021 +0100 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: --- libstdc++-v3/include/bits/regex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index a3990183580..785edc71800 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 constexpr regex_constants::syntax_option_type basic_regex<_Ch, _Tr>::icase;