From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id DE01B3858D32; Mon, 26 Sep 2022 12:59:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DE01B3858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1664197172; bh=o4osw21AkbavoiiFZaYnVbZdzEOAF0lVP+6d12cSbMA=; h=From:To:Subject:Date:From; b=Wah0xI3LdYFSWaIeYptEgONWKJc8apobOLkmYRddzLOqrvEZ9gKBlkN7Fvd4qB3sf k7yHkNf0fDNcZCwJK9bF4a6LKR70YSIcp38iqpwcKR01O+KXjfi6BLLUKaBIwUOmzD TsRVn/7SoBAes53qEbtS8XVpjMFtvyx3PWfXClYw= 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 r13-2869] libstdc++: Add #if around non-C++03 code in std::bitset [PR107037] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: d3df98807b58df186061ad52ff87cc09ba593e9b X-Git-Newrev: 6904ed80a26f5216aa3b9ce8377fb50307c8e886 Message-Id: <20220926125932.DE01B3858D32@sourceware.org> Date: Mon, 26 Sep 2022 12:59:32 +0000 (GMT) List-Id: https://gcc.gnu.org/g:6904ed80a26f5216aa3b9ce8377fb50307c8e886 commit r13-2869-g6904ed80a26f5216aa3b9ce8377fb50307c8e886 Author: Jonathan Wakely Date: Mon Sep 26 11:11:35 2022 +0100 libstdc++: Add #if around non-C++03 code in std::bitset [PR107037] libstdc++-v3/ChangeLog: PR libstdc++/107037 * include/std/bitset (_Base_bitset::_M_do_reset): Use preprocessor conditional around non-C++03 code. * testsuite/20_util/bitset/107037.cc: New test. Diff: --- libstdc++-v3/include/std/bitset | 5 +++-- libstdc++-v3/testsuite/20_util/bitset/107037.cc | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset index 6dbc58c6429..1a551cf9785 100644 --- a/libstdc++-v3/include/std/bitset +++ b/libstdc++-v3/include/std/bitset @@ -182,13 +182,14 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX14_CONSTEXPR void _M_do_reset() _GLIBCXX_NOEXCEPT { +#if __cplusplus >= 201402L if (__builtin_is_constant_evaluated()) { for (_WordT& __w : _M_w) __w = 0; return; } - +#endif __builtin_memset(_M_w, 0, _Nw * sizeof(_WordT)); } @@ -1680,7 +1681,7 @@ _GLIBCXX_END_NAMESPACE_VERSION #endif // C++11 -#ifdef _GLIBCXX_DEBUG && _GLIBCXX_HOSTED +#if defined _GLIBCXX_DEBUG && _GLIBCXX_HOSTED # include #endif diff --git a/libstdc++-v3/testsuite/20_util/bitset/107037.cc b/libstdc++-v3/testsuite/20_util/bitset/107037.cc new file mode 100644 index 00000000000..b4560dd3775 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/bitset/107037.cc @@ -0,0 +1,7 @@ +// { dg-options "-std=c++03" } +// { dg-do compile } +// PR libstdc++/107037 bitset::_M_do_reset fails for strict -std=c++03 mode +#include +template class std::bitset<0>; +template class std::bitset<1>; +template class std::bitset<100>;