From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id A1EB6385828E; Mon, 18 Mar 2024 14:04:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A1EB6385828E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1710770642; bh=l0ht227kh/6ilW1IPm9V10f3y6FnEOWo56BwHNi56IQ=; h=From:To:Subject:Date:From; b=abZ+hhDD5QGCFlWRAj1VWgOwUtKNINrJ4t/YSUt6C5H7DfhT8SQR0mwP4C5yANMb8 M/Kxiqbu5kvEhWy9SyjZR4jX1sHfmws9+TapUrE6R19BDu6bxHGkEHXyc+VsYEu1J4 uyJukv+3NEq80eQNQEQAoswxJxRf5twsnI3lLMek= 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-10229] libstdc++: Fix std::tr2::dynamic_bitset support for alternate characters X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: ac0cf0786bb3da60f412afe800fd385686b9517d X-Git-Newrev: 22273b87425aa5bccf756ff8b1887dd6d4541588 Message-Id: <20240318140402.A1EB6385828E@sourceware.org> Date: Mon, 18 Mar 2024 14:04:02 +0000 (GMT) List-Id: https://gcc.gnu.org/g:22273b87425aa5bccf756ff8b1887dd6d4541588 commit r12-10229-g22273b87425aa5bccf756ff8b1887dd6d4541588 Author: Jonathan Wakely Date: Sat Nov 18 21:09:53 2023 +0000 libstdc++: Fix std::tr2::dynamic_bitset support for alternate characters libstdc++-v3/ChangeLog: * include/tr2/dynamic_bitset (dynamic_bitset): Pass zero and one characters to _M_copy_from_string. * testsuite/tr2/dynamic_bitset/string.cc: New test. (cherry picked from commit 49f7620a12e35f40bb1f6088d16bde9b061dc819) Diff: --- libstdc++-v3/include/tr2/dynamic_bitset | 2 +- .../testsuite/tr2/dynamic_bitset/string.cc | 36 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/tr2/dynamic_bitset b/libstdc++-v3/include/tr2/dynamic_bitset index 4023b3882cb..0d2160d611d 100644 --- a/libstdc++-v3/include/tr2/dynamic_bitset +++ b/libstdc++-v3/include/tr2/dynamic_bitset @@ -622,7 +622,7 @@ namespace tr2 // Watch for npos. this->_M_Nb = (__n > __str.size() ? __str.size() - __pos : __n); this->resize(this->_M_Nb); - this->_M_copy_from_string(__str, __pos, __n); + this->_M_copy_from_string(__str, __pos, __n, __zero, __one); } /** diff --git a/libstdc++-v3/testsuite/tr2/dynamic_bitset/string.cc b/libstdc++-v3/testsuite/tr2/dynamic_bitset/string.cc new file mode 100644 index 00000000000..c7d0efac35f --- /dev/null +++ b/libstdc++-v3/testsuite/tr2/dynamic_bitset/string.cc @@ -0,0 +1,36 @@ +// { dg-do run { target c++11 } } + +#include +#include +#include + +void +test_string_ctor() +{ + std::tr2::dynamic_bitset<> b("101001"); + VERIFY( b[0] == true ); + VERIFY( b[1] == false ); + VERIFY( b[2] == false ); + VERIFY( b[3] == true ); + VERIFY( b[4] == false ); + VERIFY( b[5] == true ); +} + +void +test_alt_chars() +{ + std::string str = "xOIOIOIOx"; + std::tr2::dynamic_bitset<> b(str, 1, 6, 'I', 'O'); + VERIFY( b[0] == false ); + VERIFY( b[1] == true ); + VERIFY( b[2] == false ); + VERIFY( b[3] == true ); + VERIFY( b[4] == false ); + VERIFY( b[5] == true ); +} + +int main() +{ + test_string_ctor(); + test_alt_chars(); +}