From: Paolo Carlini Date: Wed, 21 May 2008 20:46:16 +0000 (+0000) Subject: bitset (bitset<>::bitset(const char*)): Add per DR 778. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0fda18dd70beee1713ba7b2bd8f04222fbe535bb;p=gcc.git bitset (bitset<>::bitset(const char*)): Add per DR 778. 2008-05-21 Paolo Carlini * include/std/bitset (bitset<>::bitset(const char*)): Add per DR 778. (bitset<>::_M_copy_from_ptr): Add. (bitset<>::_M_copy_from_string): Forward to the latter. * doc/xml/manual/intro.xml: Add an entry for DR 778. * testsuite/23_containers/bitset/cons/2.cc: Add. From-SVN: r135738 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 85195fb76f9..e87402745f9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2008-05-21 Paolo Carlini + + * include/std/bitset (bitset<>::bitset(const char*)): Add per DR 778. + (bitset<>::_M_copy_from_ptr): Add. + (bitset<>::_M_copy_from_string): Forward to the latter. + * doc/xml/manual/intro.xml: Add an entry for DR 778. + * testsuite/23_containers/bitset/cons/2.cc: Add. + 2008-05-21 Paolo Carlini * doc/html/ext/lwg-active.html: Update to Revision R56. diff --git a/libstdc++-v3/doc/xml/manual/intro.xml b/libstdc++-v3/doc/xml/manual/intro.xml index 1a51e9e44f9..3be651a5ad4 100644 --- a/libstdc++-v3/doc/xml/manual/intro.xml +++ b/libstdc++-v3/doc/xml/manual/intro.xml @@ -628,6 +628,12 @@ Make the member functions table and classic_table public. + + 778: + std::bitset does not have any constructor taking a string literal + + Add it. + diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset index 02631627182..50015dbd31f 100644 --- a/libstdc++-v3/include/std/bitset +++ b/libstdc++-v3/include/std/bitset @@ -786,7 +786,14 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) "not valid")); _M_copy_from_string(__s, __position, __n); } - + + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 778. std::bitset does not have any constructor taking a string literal + explicit + bitset(const char* __s) + : _Base() + { _M_copy_from_ptr(__s, char_traits::length(__s), 0, size_t(-1)); } + // 23.3.5.2 bitset operations: //@{ /** @@ -1049,11 +1056,15 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) } // Helper functions for string operations. + template + void + _M_copy_from_ptr(const _CharT*, size_t, size_t, size_t); + template void _M_copy_from_string(const std::basic_string<_CharT, - _Traits, _Alloc>& __s, - size_t, size_t); + _Traits, _Alloc>& __s, size_t __pos, size_t __n) + { _M_copy_from_ptr(__s.data(), __s.size(), __pos, __n); } template void @@ -1155,14 +1166,14 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) // Definitions of non-inline member functions. template - template + template void bitset<_Nb>:: - _M_copy_from_string(const std::basic_string<_CharT, _Traits, - _Alloc>& __s, size_t __pos, size_t __n) + _M_copy_from_ptr(const _CharT* __s, size_t __len, + size_t __pos, size_t __n) { reset(); - const size_t __nbits = std::min(_Nb, std::min(__n, __s.size() - __pos)); + const size_t __nbits = std::min(_Nb, std::min(__n, __len - __pos)); for (size_t __i = __nbits; __i > 0; --__i) { switch(__s[__pos + __nbits - __i]) @@ -1173,7 +1184,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) _Unchecked_set(__i - 1); break; default: - __throw_invalid_argument(__N("bitset::_M_copy_from_string")); + __throw_invalid_argument(__N("bitset::_M_copy_from_ptr")); } } } diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/2.cc b/libstdc++-v3/testsuite/23_containers/bitset/cons/2.cc new file mode 100644 index 00000000000..24bb6213e60 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/bitset/cons/2.cc @@ -0,0 +1,49 @@ +// 2008-05-21 Paolo Carlini + +// Copyright (C) 2008 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. + +#include +#include + +// DR 778. std::bitset does not have any constructor taking a string literal. +void test01() +{ + bool test __attribute__((unused)) = true; + + std::bitset<4> z1("1101"); + std::bitset<4> z1_ref(std::string("1101")); + VERIFY( z1.to_string() == "1101" ); + VERIFY( z1 == z1_ref ); + + std::bitset<8> z2("1011"); + std::bitset<8> z2_ref(std::string("1011")); + VERIFY( z2.to_string() == "00001011" ); + VERIFY( z2 == z2_ref ); + + std::bitset<2> z3("1101"); + std::bitset<2> z3_ref(std::string("1101")); + VERIFY( z3.to_string() == "11" ); + VERIFY( z3 == z3_ref ); +} + +int main() +{ + test01(); + return 0; +}