summaryrefslogtreecommitdiffstats
path: root/libstdc++-v3/include/std/bitset
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2009-12-31 17:31:28 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2009-12-31 17:31:28 +0000
commit8539c541b27144e2f1380d7ea9a7214b221fabab (patch)
tree45eb08e87dd2bce20c8fe3c6ce17a56c77f162ad /libstdc++-v3/include/std/bitset
parent7d374786ba5b1f4ec367cc6ce8ad1c271352c718 (diff)
downloadppe42-gcc-8539c541b27144e2f1380d7ea9a7214b221fabab.tar.gz
ppe42-gcc-8539c541b27144e2f1380d7ea9a7214b221fabab.zip
2009-12-31 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/bitset (bitset<>::bitset(unsigned long long), _Base_bitset<>::_Base_bitset(unsigned long long)): Add in C++0x mode. * testsuite/23_containers/bitset/cons/3.cc: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@155539 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std/bitset')
-rw-r--r--libstdc++-v3/include/std/bitset20
1 files changed, 20 insertions, 0 deletions
diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset
index 78843557e16..06fdd3f4768 100644
--- a/libstdc++-v3/include/std/bitset
+++ b/libstdc++-v3/include/std/bitset
@@ -76,10 +76,18 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
_Base_bitset()
{ _M_do_reset(); }
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+ _Base_bitset(unsigned long long __val)
+#else
_Base_bitset(unsigned long __val)
+#endif
{
_M_do_reset();
_M_w[0] = __val;
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+ if (sizeof(unsigned long long) > sizeof(unsigned long))
+ _M_w[1] = __val >> _GLIBCXX_BITSET_BITS_PER_WORD;
+#endif
}
static size_t
@@ -359,7 +367,11 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
: _M_w(0)
{ }
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+ _Base_bitset(unsigned long long __val)
+#else
_Base_bitset(unsigned long __val)
+#endif
: _M_w(__val)
{ }
@@ -491,7 +503,11 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
_Base_bitset()
{ }
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+ _Base_bitset(unsigned long long)
+#else
_Base_bitset(unsigned long)
+#endif
{ }
static size_t
@@ -771,7 +787,11 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
{ }
/// Initial bits bitwise-copied from a single word (others set to zero).
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+ bitset(unsigned long long __val)
+#else
bitset(unsigned long __val)
+#endif
: _Base(__val)
{ _M_do_sanitize(); }
OpenPOWER on IntegriCloud