bitset (_Base_bitset<>::_Base_bitset(), [...]): Simplify.

2010-12-08  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/std/bitset (_Base_bitset<>::_Base_bitset(),
	_Base_bitset(unsigned long)): Simplify.

From-SVN: r167624
This commit is contained in:
Paolo Carlini 2010-12-09 02:33:55 +00:00 committed by Paolo Carlini
parent 2b00e20179
commit b6710d1a51
2 changed files with 10 additions and 9 deletions

View File

@ -1,3 +1,8 @@
2010-12-08 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/bitset (_Base_bitset<>::_Base_bitset(),
_Base_bitset(unsigned long)): Simplify.
2010-12-07 François Dumont <francois.cppdevs@free.fr> 2010-12-07 François Dumont <francois.cppdevs@free.fr>
* include/bits/stl_iterator.h: Add move_iterator operators overloads * include/bits/stl_iterator.h: Add move_iterator operators overloads

View File

@ -72,9 +72,10 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
/// 0 is the least significant word. /// 0 is the least significant word.
_WordT _M_w[_Nw]; _WordT _M_w[_Nw];
#ifdef __GXX_EXPERIMENTAL_CXX0X__ _GLIBCXX_CONSTEXPR _Base_bitset()
constexpr _Base_bitset() : _M_w({ }) { } : _M_w() { }
#ifdef __GXX_EXPERIMENTAL_CXX0X__
constexpr _Base_bitset(unsigned long long __val) constexpr _Base_bitset(unsigned long long __val)
: _M_w({ _WordT(__val) : _M_w({ _WordT(__val)
#if __SIZEOF_LONG_LONG__ > __SIZEOF_LONG__ #if __SIZEOF_LONG_LONG__ > __SIZEOF_LONG__
@ -82,14 +83,9 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
#endif #endif
}) { } }) { }
#else #else
_Base_bitset()
{ _M_do_reset(); }
_Base_bitset(unsigned long __val) _Base_bitset(unsigned long __val)
{ : _M_w()
_M_do_reset(); { _M_w[0] = __val; }
_M_w[0] = __val;
}
#endif #endif
static _GLIBCXX_CONSTEXPR size_t static _GLIBCXX_CONSTEXPR size_t