2010-02-22 Paolo Carlini <paolo.carlini@oracle.com>

	* src/hash-aux.cc: Rename to...
	* src/hash-string-aux.cc: ... this.
	* src/hash-long-double-aux.cc: New.
	* src/hash_c++0x.cc: Adjust.
	* src/hash_tr1.cc: Likewise.
	* src/compatibility-c++0x.cc: Likewise.


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

6 files changed, 64 insertions, 55 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 15f1ff8d7aa..c32971f1ff4 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-22  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* src/hash-aux.cc: Rename to...
+	* src/hash-string-aux.cc: ... this.
+	* src/hash-long-double-aux.cc: New.
+	* src/hash_c++0x.cc: Adjust.
+	* src/hash_tr1.cc: Likewise.
+	* src/compatibility-c++0x.cc: Likewise.
+
 2010-02-22  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* doc/xml/class.txml: Adjust biblio markup.
diff --git a/libstdc++-v3/src/compatibility-c++0x.cc b/libstdc++-v3/src/compatibility-c++0x.cc
index 75df7497a40..abdc72c0832 100644
--- a/libstdc++-v3/src/compatibility-c++0x.cc
+++ b/libstdc++-v3/src/compatibility-c++0x.cc
@@ -50,7 +50,7 @@ namespace std
   // We need these due to the symbols exported since GLIBCXX_3.4.10.
   // See libstdc++/41662 for details.
 
-#include "hash-aux.cc"
+#include "hash-string-aux.cc"
 
   template<>
     size_t
diff --git a/libstdc++-v3/src/hash-long-double-aux.cc b/libstdc++-v3/src/hash-long-double-aux.cc
new file mode 100644
index 00000000000..5b8bbfdd49d
--- /dev/null
+++ b/libstdc++-v3/src/hash-long-double-aux.cc
@@ -0,0 +1,50 @@
+//  std::hash and std::tr1::hash definitions, long double bits -*- C++ -*-
+
+// Copyright (C) 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
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+  // For long double, careful with random padding bits (e.g., on x86,
+  // 10 bytes -> 12 bytes) and resort to frexp.
+  template<>
+    size_t
+    hash<long double>::operator()(long double __val) const
+    {
+      size_t __result = 0;
+
+      int __exponent;
+      __val = __builtin_frexpl(__val, &__exponent);
+      __val = __val < 0.0l ? -(__val + 0.5l) : __val;
+
+      const long double __mult = __SIZE_MAX__ + 1.0l;
+      __val *= __mult;
+
+      // Try to use all the bits of the mantissa (really necessary only
+      // on 32-bit targets, at least for 80-bit floating point formats).
+      const size_t __hibits = (size_t)__val;
+      __val = (__val - (long double)__hibits) * __mult;
+
+      const size_t __coeff = __SIZE_MAX__ / __LDBL_MAX_EXP__;
+
+      __result = __hibits + (size_t)__val + __coeff * __exponent;
+
+      return __result;
+    }
diff --git a/libstdc++-v3/src/hash-aux.cc b/libstdc++-v3/src/hash-string-aux.cc
index e3f15d78ee3..1da015c1fd5 100644
--- a/libstdc++-v3/src/hash-aux.cc
+++ b/libstdc++-v3/src/hash-string-aux.cc
@@ -1,4 +1,4 @@
-//  std::hash and std::tr1::hash definitions -*- C++ -*-
+//  std::hash and std::tr1::hash definitions, string bits -*- C++ -*-
 
 // Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 //
diff --git a/libstdc++-v3/src/hash_c++0x.cc b/libstdc++-v3/src/hash_c++0x.cc
index df97dff219f..ba007f84b54 100644
--- a/libstdc++-v3/src/hash_c++0x.cc
+++ b/libstdc++-v3/src/hash_c++0x.cc
@@ -30,29 +30,5 @@
 
 namespace std
 {
-  /// std::hash specialization for long double.
-  template<>
-    size_t
-    hash<long double>::operator()(long double __val) const
-    {
-      size_t __result = 0;
-
-      int __exponent;
-      __val = __builtin_frexpl(__val, &__exponent);
-      __val = __val < 0.0l ? -(__val + 0.5l) : __val;
-
-      const long double __mult = __SIZE_MAX__ + 1.0l;
-      __val *= __mult;
-
-      // Try to use all the bits of the mantissa (really necessary only
-      // on 32-bit targets, at least for 80-bit floating point formats).
-      const size_t __hibits = (size_t)__val;
-      __val = (__val - (long double)__hibits) * __mult;
-
-      const size_t __coeff = __SIZE_MAX__ / __LDBL_MAX_EXP__;
-
-      __result = __hibits + (size_t)__val + __coeff * __exponent;
-	
-      return __result;
-    }  
+#include "hash-long-double-aux.cc"
 }
diff --git a/libstdc++-v3/src/hash_tr1.cc b/libstdc++-v3/src/hash_tr1.cc
index ecbb37dcd6e..0dca086b95c 100644
--- a/libstdc++-v3/src/hash_tr1.cc
+++ b/libstdc++-v3/src/hash_tr1.cc
@@ -29,33 +29,7 @@ namespace std
 {
   namespace tr1 
   {
-#include "hash-aux.cc"
-
-    // For long double, careful with random padding bits (e.g., on x86,
-    // 10 bytes -> 12 bytes) and resort to frexp.
-    template<>
-      size_t
-      hash<long double>::operator()(long double __val) const
-      {
-	size_t __result = 0;
-
-	int __exponent;
-	__val = __builtin_frexpl(__val, &__exponent);
-	__val = __val < 0.0l ? -(__val + 0.5l) : __val;
-
-	const long double __mult = __SIZE_MAX__ + 1.0l;
-	__val *= __mult;
-
-	// Try to use all the bits of the mantissa (really necessary only
-	// on 32-bit targets, at least for 80-bit floating point formats).
-	const size_t __hibits = (size_t)__val;
-	__val = (__val - (long double)__hibits) * __mult;
-
-	const size_t __coeff = __SIZE_MAX__ / __LDBL_MAX_EXP__;
-
-	__result = __hibits + (size_t)__val + __coeff * __exponent;
-
-	return __result;
-      }
+#include "hash-long-double-aux.cc"
+#include "hash-string-aux.cc"
   }
 }