commit f52511fc6ebd24e33a211d66209d5cd14d650a50
author Howard Hinnant <hhinnant@apple.com> Fri Dec 02 23:45:22 2011 +0000
committer Howard Hinnant <hhinnant@apple.com> Fri Dec 02 23:45:22 2011 +0000
tree 8f5ed95b39f3120a7f8350c30bb197d60ca86783
parent fb84da17f5cdce7d8bc0042298134b6cb6f3096c

I had picked up the wrong version of DaveZ's hash patches.  Corrected here.

llvm-svn: 145728
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 7f3884d58a1a90831a9946b7b8693cd4334611af

include/functional

diff --git a/include/functional b/include/functional
index b5b08ab..243f398 100644
--- a/include/functional
+++ b/include/functional
@@ -1921,19 +1921,19 @@
     _LIBCPP_INLINE_VISIBILITY
     size_t operator()(long long __v) const _NOEXCEPT
     {
-#ifdef __LP64__
-        return __v;
-#else
-        union {
+        if (sizeof(long long) == sizeof(size_t))
+            return __v;
+        union
+        {
             long long __l;
-            struct {
-                int __a;
-                int __b;
+            struct
+            {
+                size_t __a;
+                size_t __b;
             } __s;
         } __u;
         __u.__l = __v;
         return __u.__s.__a ^ __u.__s.__b;
-#endif
     }
 };
 
@@ -1944,19 +1944,19 @@
     _LIBCPP_INLINE_VISIBILITY
     size_t operator()(unsigned long long __v) const _NOEXCEPT
     {
-#ifdef __LP64__
-        return __v;
-#else
-        union {
-            unsigned long long __ul;
-            struct {
-                int __a;
-                int __b;
+        if (sizeof(unsigned long long) == sizeof(size_t))
+            return __v;
+        union
+        {
+            unsigned long long __l;
+            struct
+            {
+                size_t __a;
+                size_t __b;
             } __s;
         } __u;
-        __u.__ul = __v;
+        __u.__l = __v;
         return __u.__s.__a ^ __u.__s.__b;
-#endif
     }
 };
 
@@ -1967,16 +1967,13 @@
     _LIBCPP_INLINE_VISIBILITY
     size_t operator()(float __v) const _NOEXCEPT
     {
-        union {
-#ifdef __LP64__
-            double __f;
-#else
-            float __f;
-#endif
+       if (__v == 0)
+           return 0;
+        union
+        {
             size_t __d;
+            float __f;
         } __u;
-        if (__v == 0)
-            return 0;
         __u.__f = __v;
         return __u.__d;
     }
@@ -1989,16 +1986,23 @@
     _LIBCPP_INLINE_VISIBILITY
     size_t operator()(double __v) const _NOEXCEPT
     {
-        union {
-#ifdef __LP64__
-            double __f;
-#else
-            float __f;
-#endif
-            size_t __d;
-        } __u;
         if (__v == 0)
             return 0;
+        if (sizeof(double) == sizeof(size_t))
+        {
+            union
+            {
+                double __f;
+                size_t __d;
+            } __u;
+            __u.__f = __v;
+            return __u.__d;
+        }
+        union
+        {
+            float __f;
+            size_t __d;
+        } __u;
         __u.__f = __v;
         return __u.__d;
     }
@@ -2011,16 +2015,22 @@
     _LIBCPP_INLINE_VISIBILITY
     size_t operator()(long double __v) const _NOEXCEPT
     {
-        union {
-#ifdef __LP64__
-            double __f;
-#else
-            float __f;
-#endif
-            size_t __d;
-        } __u;
         if (__v == 0)
             return 0;
+        if (sizeof(double) == sizeof(size_t))
+        {
+            union
+            {
+                double __f;
+                size_t __d;
+            } __u;
+            __u.__f = __v;
+            return __u.__d;
+        }
+        union {
+            float __f;
+            size_t __d;
+        } __u;
         __u.__f = __v;
         return __u.__d;
     }