From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 3 Jan 2010 16:17:44 +0000 (+0000)
Subject: 2010-01-03  Paolo Carlini  <paolo.carlini@oracle.com>
X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=6fa5613817047cd67068c5750e689ed5a50ec01e;p=pf3gnuchains%2Fgcc-fork.git

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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@155589 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f768680e965..f77a30123ce 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 734bf228654..e78eb561573 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 7df8d88d7a8..21464767331 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