From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 79023384B823; Thu, 7 Jul 2022 23:32:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 79023384B823 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 r11-10121] libstdc++: Fix preprocessor check for C++17 X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: e61c16fd9ba89e7bc12284e524dcd8379c2bebfc X-Git-Newrev: 03327fc89996aa1ecc28e2e5906b1279f0c9ad7c Message-Id: <20220707233229.79023384B823@sourceware.org> Date: Thu, 7 Jul 2022 23:32:29 +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, 07 Jul 2022 23:32:29 -0000 https://gcc.gnu.org/g:03327fc89996aa1ecc28e2e5906b1279f0c9ad7c commit r11-10121-g03327fc89996aa1ecc28e2e5906b1279f0c9ad7c Author: Jonathan Wakely Date: Thu Sep 30 08:59:21 2021 +0100 libstdc++: Fix preprocessor check for C++17 libstdc++-v3/ChangeLog: * include/bits/regex.h (basic_regex::multiline): Fix #if condition. (cherry picked from commit c5369961fa3a5a319f1cc1469c6afb8b679e4846) 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 08d22a2da30..f794a0f8f00 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -414,7 +414,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 static constexpr flag_type awk = regex_constants::awk; static constexpr flag_type grep = regex_constants::grep; static constexpr flag_type egrep = regex_constants::egrep; -#if __cplusplus >= 2017 +#if __cplusplus >= 201703L static constexpr flag_type multiline = regex_constants::multiline; #endif ///@}