diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2010-11-02 15:52:09 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-11-02 15:52:09 +0000 |
| commit | 7350a36115f9752910ec4829f25e2d45a684d91e (patch) | |
| tree | 7bb9034e7ee9c5cb99ae14c4abecb1cf1958f656 | |
| parent | 43427f3c581470449ed62ebaebeabe6a49c94e6f (diff) | |
| download | gcc-7350a36115f9752910ec4829f25e2d45a684d91e.zip gcc-7350a36115f9752910ec4829f25e2d45a684d91e.tar.gz gcc-7350a36115f9752910ec4829f25e2d45a684d91e.tar.bz2 | |
bitset (_Base_bitset<>_Base_bitset(unsigned long long)): Convert __val to _WordT.
2010-11-02 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/bitset (_Base_bitset<>_Base_bitset(unsigned long long)):
Convert __val to _WordT.
From-SVN: r166195
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/bitset | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c78c71f..aa98bfe 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2010-11-02 Paolo Carlini <paolo.carlini@oracle.com> + + * include/std/bitset (_Base_bitset<>_Base_bitset(unsigned long long)): + Convert __val to _WordT. + 2010-11-01 Benjamin Kosnik <bkoz@redhat.com> * include/std/chrono: Extend constexpr application. diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset index fafbb32..db20eaf 100644 --- a/libstdc++-v3/include/std/bitset +++ b/libstdc++-v3/include/std/bitset @@ -76,9 +76,9 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) constexpr _Base_bitset() : _M_w({ }) { } constexpr _Base_bitset(unsigned long long __val) - : _M_w({ __val + : _M_w({ _WordT(__val) #if __SIZEOF_LONG_LONG__ > __SIZEOF_LONG__ - , __val >> _GLIBCXX_BITSET_BITS_PER_WORD + , _WordT(__val >> _GLIBCXX_BITSET_BITS_PER_WORD) #endif }) { } #else |