Skip to content

R
riscv-gcc-1
Commit 9daf8216 by Paolo Carlini Committed by Paolo Carlini
Options

re PR libstdc++/38244 (bitset initialization from 0 rejected.) 

2008-11-24  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/38244
	* include/std/bitset (bitset<>::bitset(const char*, char, char)):
	Remove, do not implement DR 778.
	* doc/xml/manual/intro.xml: Remove entry for DR 778.
	* testsuite/23_containers/bitset/cons/2.cc: Remove.
	* testsuite/23_containers/bitset/cons/dr396.cc: Tweak.
	* testsuite/23_containers/bitset/cons/38244.cc: Add.

From-SVN: r142152
parent f07bde68
Showing with 60 additions and 85 deletions
libstdc++-v3/ChangeLog
2008-11-24 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/38244
* include/std/bitset (bitset<>::bitset(const char*, char, char)):
Remove, do not implement DR 778.
* doc/xml/manual/intro.xml: Remove entry for DR 778.
* testsuite/23_containers/bitset/cons/2.cc: Remove.
* testsuite/23_containers/bitset/cons/dr396.cc: Tweak.
* testsuite/23_containers/bitset/cons/38244.cc: Add.
2008-11-21 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/22_locale/num_put/put/char/38210.cc: Tweak.
......
libstdc++-v3/doc/xml/manual/intro.xml
......@@ -684,13 +684,6 @@
<listitem><para>In C++0x mode, remove assign, add fill.
</para></listitem></varlistentry>
<varlistentry><term><ulink url="../ext/lwg-defects.html#778">778</ulink>:
<emphasis>std::bitset does not have any constructor taking a string
literal</emphasis>
</term>
<listitem><para>Add it.
</para></listitem></varlistentry>
<varlistentry><term><ulink url="../ext/lwg-defects.html#781">781</ulink>:
<emphasis>std::complex should add missing C99 functions</emphasis>
</term>
......
libstdc++-v3/include/std/bitset
......@@ -802,17 +802,6 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
_M_copy_from_string(__s, __position, __n, __zero, __one);
}
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 778. std::bitset does not have any constructor taking a string literal
explicit
bitset(const char* __s, char __zero = '0', char __one = '1')
: _Base()
{
_M_copy_from_ptr<char, char_traits<char> >(__s,
char_traits<char>::length(__s), 0, size_t(-1),
__zero, __one);
}
// 23.3.5.2 bitset operations:
//@{
/**
......
libstdc++-v3/testsuite/23_containers/bitset/cons/2.cc deleted 100644 → 0
// 2008-05-21 Paolo Carlini <paolo.carlini@oracle.com>
// 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 <bitset>
#include <testsuite_hooks.h>
// 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;
}
libstdc++-v3/testsuite/23_containers/bitset/cons/38244.cc 0 → 100644
// 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.
// { dg-do compile }
#include <bitset>
class C0
{
public:
C0() : b(0) { }
private:
std::bitset<1> b;
};
class C1
{
public:
C1() : b(1) { }
private:
std::bitset<1> b;
};
// libstdc++/38244
void func()
{
C0 val0;
C1 val1;
}
libstdc++-v3/testsuite/23_containers/bitset/cons/dr396.cc
......@@ -26,35 +26,23 @@ void test01()
{
bool test __attribute__((unused)) = true;
std::bitset<4> z1("bbab", 'a', 'b');
std::bitset<4> z1_ref(std::string("bbab"), 0, std::string::npos, 'a', 'b');
std::bitset<4> z1(std::string("bbab"), 0, std::string::npos, 'a', 'b');
VERIFY( z1.to_string('a', 'b') == "bbab" );
VERIFY( z1 == z1_ref );
std::bitset<4> z2("11a1", 'a');
std::bitset<4> z2_ref(std::string("11a1"), 0, std::string::npos, 'a');
std::bitset<4> z2(std::string("11a1"), 0, std::string::npos, 'a');
VERIFY( z2.to_string('a') == "11a1" );
VERIFY( z2 == z2_ref );
std::bitset<8> z3("babb", 'a', 'b');
std::bitset<8> z3_ref(std::string("babb"), 0, std::string::npos, 'a', 'b');
std::bitset<8> z3(std::string("babb"), 0, std::string::npos, 'a', 'b');
VERIFY( z3.to_string('a', 'b') == "aaaababb" );
VERIFY( z3 == z3_ref );
std::bitset<8> z4("1a11", 'a');
std::bitset<8> z4_ref(std::string("1a11"), 0, std::string::npos, 'a');
std::bitset<8> z4(std::string("1a11"), 0, std::string::npos, 'a');
VERIFY( z4.to_string('a') == "aaaa1a11" );
VERIFY( z4 == z4_ref );
std::bitset<2> z5("bbab", 'a', 'b');
std::bitset<2> z5_ref(std::string("bbab"), 0, std::string::npos, 'a', 'b');
std::bitset<2> z5(std::string("bbab"), 0, std::string::npos, 'a', 'b');
VERIFY( z5.to_string('a', 'b') == "bb" );
VERIFY( z5 == z5_ref );
std::bitset<2> z6("11a1", 'a');
std::bitset<2> z6_ref(std::string("11a1"), 0, std::string::npos, 'a');
std::bitset<2> z6(std::string("11a1"), 0, std::string::npos, 'a');
VERIFY( z6.to_string('a') == "11" );
VERIFY( z6 == z6_ref );
}
int main()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment