aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2010-01-03 16:17:44 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2010-01-03 16:17:44 +0000
commiteb07a8f567dbb31885c23dbceb43db4489ca1884 (patch)
treee8907e94580d4b8d8f3ac530ea24c3caffedd790
parentba1ee2281d44f1443bae38966276221abedd39d7 (diff)
downloadgcc-eb07a8f567dbb31885c23dbceb43db4489ca1884.zip
gcc-eb07a8f567dbb31885c23dbceb43db4489ca1884.tar.gz
gcc-eb07a8f567dbb31885c23dbceb43db4489ca1884.tar.bz2
bitset (bitset<>::bitset(unsigned long long)): Add in C++0x mode.
2010-01-03 Paolo Carlini <paolo.carlini@oracle.com> * include/profile/bitset (bitset<>::bitset(unsigned long long)): Add in C++0x mode. * include/debug/bitset (bitset<>::bitset(unsigned long long)): Likewise. From-SVN: r155589
-rw-r--r--libstdc++-v3/ChangeLog7
-rw-r--r--libstdc++-v3/include/debug/bitset9
-rw-r--r--libstdc++-v3/include/profile/bitset9
3 files changed, 21 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f768680..f77a301 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,12 @@
2010-01-03 Paolo Carlini <paolo.carlini@oracle.com>
+ * include/profile/bitset (bitset<>::bitset(unsigned long long)): Add
+ in C++0x mode.
+ * include/debug/bitset (bitset<>::bitset(unsigned long long)):
+ Likewise.
+
+2010-01-03 Paolo Carlini <paolo.carlini@oracle.com>
+
* include/tr1_impl/hashtable (_Hashtable<>): Remove insert_return_type
typedef.
* include/profile/unordered_map (unordered_map<>::insert(const
diff --git a/libstdc++-v3/include/debug/bitset b/libstdc++-v3/include/debug/bitset
index 734bf22..e78eb56 100644
--- a/libstdc++-v3/include/debug/bitset
+++ b/libstdc++-v3/include/debug/bitset
@@ -1,6 +1,6 @@
// Debugging bitset implementation -*- C++ -*-
-// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
+// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -120,7 +120,12 @@ namespace __debug
// 23.3.5.1 constructors:
bitset() : _Base() { }
- bitset(unsigned long __val) : _Base(__val) { }
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+ bitset(unsigned long long __val)
+#else
+ bitset(unsigned long __val)
+#endif
+ : _Base(__val) { }
template<typename _CharT, typename _Traits, typename _Alloc>
explicit
diff --git a/libstdc++-v3/include/profile/bitset b/libstdc++-v3/include/profile/bitset
index 7df8d88..2146476 100644
--- a/libstdc++-v3/include/profile/bitset
+++ b/libstdc++-v3/include/profile/bitset
@@ -1,6 +1,6 @@
// Profiling bitset implementation -*- C++ -*-
-// Copyright (C) 2009 Free Software Foundation, Inc.
+// Copyright (C) 2009, 2010 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
@@ -97,7 +97,12 @@ namespace __profile
// 23.3.5.1 constructors:
bitset() : _Base() { }
- bitset(unsigned long __val) : _Base(__val) { }
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+ bitset(unsigned long long __val)
+#else
+ bitset(unsigned long __val)
+#endif
+ : _Base(__val) { }
template<typename _CharT, typename _Traits, typename _Alloc>
explicit