mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2025-01-24 05:14:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

bitset (bitset<>::to_ullong, [...]): Add.

Browse Source 
2009-12-29  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/std/bitset (bitset<>::to_ullong, _M_do_to_ullong): Add.
	(_Base_bitset<>::_M_do_to_ullong): Add.
	* include/debug/bitset (bitset<>): Add using _Base::to_ullong.
	* include/profile/bitset (bitset<>): Likewise.
	* testsuite/23_containers/bitset/to_ullong/1.cc: New.

From-SVN: r155504
This commit is contained in:
Paolo Carlini 2009-12-29 12:24:36 +00:00 committed by Paolo Carlini
parent 497d63a44e
commit 700d289947
5 changed files with 98 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2009-12-29 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/bitset (bitset<>::to_ullong, _M_do_to_ullong): Add.
(_Base_bitset<>::_M_do_to_ullong): Add.
* include/debug/bitset (bitset<>): Add using _Base::to_ullong.
* include/profile/bitset (bitset<>): Likewise.
* testsuite/23_containers/bitset/to_ullong/1.cc: New.
2009-12-28 Paolo Carlini <paolo.carlini@oracle.com>
* include/debug/bitset (bitset<>::bitset(const char*)): Add.

3
libstdc++-v3/include/debug/bitset
View File

@ -251,6 +251,9 @@ namespace __debug
}
using _Base::to_ulong;
#ifdef __GXX_EXPERIMENTAL_CXX0X__
using _Base::to_ullong;
#endif
template <typename _CharT, typename _Traits, typename _Alloc>
std::basic_string<_CharT, _Traits, _Alloc>

3
libstdc++-v3/include/profile/bitset
View File

@ -226,6 +226,9 @@ namespace __profile
}
using _Base::to_ulong;
#ifdef __GXX_EXPERIMENTAL_CXX0X__
using _Base::to_ullong;
#endif
template <typename _CharT, typename _Traits, typename _Alloc>
std::basic_string<_CharT, _Traits, _Alloc>

40
libstdc++-v3/include/std/bitset
View File

@ -199,6 +199,11 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
unsigned long
_M_do_to_ulong() const;
#ifdef __GXX_EXPERIMENTAL_CXX0X__
unsigned long long
_M_do_to_ullong() const;
#endif
// find first "on" bit
size_t
_M_do_find_first(size_t __not_found) const;
@ -272,6 +277,23 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
return _M_w[0];
}
#ifdef __GXX_EXPERIMENTAL_CXX0X__
template<size_t _Nw>
unsigned long long
_Base_bitset<_Nw>::_M_do_to_ullong() const
{
const bool __dw = sizeof(unsigned long long) > sizeof(unsigned long);
for (size_t __i = 1 + __dw; __i < _Nw; ++__i)
if (_M_w[__i])
__throw_overflow_error(__N("_Base_bitset::_M_do_to_ullong"));
if (__dw)
return _M_w[0] + (static_cast<unsigned long long>(_M_w[1])
<< _GLIBCXX_BITSET_BITS_PER_WORD);
return _M_w[0];
}
#endif
template<size_t _Nw>
size_t
_Base_bitset<_Nw>::_M_do_find_first(size_t __not_found) const
@ -425,6 +447,12 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
_M_do_to_ulong() const
{ return _M_w; }
#ifdef __GXX_EXPERIMENTAL_CXX0X__
unsigned long long
_M_do_to_ullong() const
{ return _M_w; }
#endif
size_t
_M_do_find_first(size_t __not_found) const
{
@ -555,6 +583,12 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
_M_do_to_ulong() const
{ return 0; }
#ifdef __GXX_EXPERIMENTAL_CXX0X__
unsigned long long
_M_do_to_ullong() const
{ return 0; }
#endif
// Normally "not found" is the size, but that could also be
// misinterpreted as an index in this corner case. Oh well.
size_t
@ -1039,6 +1073,12 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
to_ulong() const
{ return this->_M_do_to_ulong(); }
#ifdef __GXX_EXPERIMENTAL_CXX0X__
unsigned long long
to_ullong() const
{ return this->_M_do_to_ullong(); }
#endif
/**
* @brief Returns a character interpretation of the %bitset.
* @return The string equivalent of the bits.

44
libstdc++-v3/testsuite/23_containers/bitset/to_ullong/1.cc Normal file
View File

@ -0,0 +1,44 @@
// { dg-options "-std=gnu++0x" }
// 2009-12-29 Paolo Carlini <paolo.carlini@oracle.com>
// Copyright (C) 2009 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 3, 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 COPYING3. If not see
// <http://www.gnu.org/licenses/>.
#include <bitset>
#include <testsuite_hooks.h>
void test01()
{
bool test __attribute__((unused)) = true;
std::bitset<0> bs0;
VERIFY( bs0.to_ullong() == 0 );
std::bitset<64> bs1("11010111");
VERIFY( bs1.to_ullong() == 215 );
std::bitset<64> bs2("10110100100010000100000101111111"
"01111110011111110001110001100011");
VERIFY( bs2.to_ullong() == 13008719539498589283ULL );
}
int main()
{
test01();
return 0;
}