diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/bitset | 14 |
2 files changed, 10 insertions, 9 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1447927..ed2b11d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -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> * include/bits/stl_iterator.h: Add move_iterator operators overloads diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset index db20eaf..86f361c 100644 --- a/libstdc++-v3/include/std/bitset +++ b/libstdc++-v3/include/std/bitset @@ -72,9 +72,10 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) /// 0 is the least significant word. _WordT _M_w[_Nw]; -#ifdef __GXX_EXPERIMENTAL_CXX0X__ - constexpr _Base_bitset() : _M_w({ }) { } + _GLIBCXX_CONSTEXPR _Base_bitset() + : _M_w() { } +#ifdef __GXX_EXPERIMENTAL_CXX0X__ constexpr _Base_bitset(unsigned long long __val) : _M_w({ _WordT(__val) #if __SIZEOF_LONG_LONG__ > __SIZEOF_LONG__ @@ -82,14 +83,9 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) #endif }) { } #else - _Base_bitset() - { _M_do_reset(); } - _Base_bitset(unsigned long __val) - { - _M_do_reset(); - _M_w[0] = __val; - } + : _M_w() + { _M_w[0] = __val; } #endif static _GLIBCXX_CONSTEXPR size_t |