diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f768680e9652855d004d358c3ebb5d1ad0d55944..f77a30123cee291418bbd2201a587f41cfe1b9b1 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +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 diff --git a/libstdc++-v3/include/debug/bitset b/libstdc++-v3/include/debug/bitset index 734bf228654e3d16f79bd2a8cc40ac8483f621b5..e78eb5615734dea1e5ae213d28adb65ee0714d2a 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 7df8d88d7a8f47101e4b306a40eca70b28711bd6..21464767331309bd4f6fbb9b5f4bc11e727b166a 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