generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@145728 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant 2011-12-02 23:45:22 +00:00
parent 62453ea71d
commit 2891675aad
1 changed files with 52 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
include/functional
View File

@ -1921,19 +1921,19 @@ struct _LIBCPP_VISIBLE hash<long long>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
size_t operator()(long long __v) const _NOEXCEPT size_t operator()(long long __v) const _NOEXCEPT
{ {
#ifdef __LP64__ if (sizeof(long long) == sizeof(size_t))
return __v; return __v;
#else union
union { {
long long __l; long long __l;
struct { struct
int __a; {
int __b; size_t __a;
size_t __b;
} __s; } __s;
} __u; } __u;
__u.__l = __v; __u.__l = __v;
return __u.__s.__a ^ __u.__s.__b; return __u.__s.__a ^ __u.__s.__b;
#endif
} }
}; };
@ -1944,19 +1944,19 @@ struct _LIBCPP_VISIBLE hash<unsigned long long>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
size_t operator()(unsigned long long __v) const _NOEXCEPT size_t operator()(unsigned long long __v) const _NOEXCEPT
{ {
#ifdef __LP64__ if (sizeof(unsigned long long) == sizeof(size_t))
return __v; return __v;
#else union
union { {
unsigned long long __ul; unsigned long long __l;
struct { struct
int __a; {
int __b; size_t __a;
size_t __b;
} __s; } __s;
} __u; } __u;
__u.__ul = __v; __u.__l = __v;
return __u.__s.__a ^ __u.__s.__b; return __u.__s.__a ^ __u.__s.__b;
#endif
} }
}; };
@ -1967,16 +1967,13 @@ struct _LIBCPP_VISIBLE hash<float>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
size_t operator()(float __v) const _NOEXCEPT size_t operator()(float __v) const _NOEXCEPT
{ {
union {
#ifdef __LP64__
double __f;
#else
float __f;
#endif
size_t __d;
} __u;
if (__v == 0) if (__v == 0)
return 0; return 0;
union
{
size_t __d;
float __f;
} __u;
__u.__f = __v; __u.__f = __v;
return __u.__d; return __u.__d;
} }
@ -1989,16 +1986,23 @@ struct _LIBCPP_VISIBLE hash<double>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
size_t operator()(double __v) const _NOEXCEPT size_t operator()(double __v) const _NOEXCEPT
{ {
union {
#ifdef __LP64__
double __f;
#else
float __f;
#endif
size_t __d;
} __u;
if (__v == 0) if (__v == 0)
return 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; __u.__f = __v;
return __u.__d; return __u.__d;
} }
@ -2011,16 +2015,22 @@ struct _LIBCPP_VISIBLE hash<long double>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
size_t operator()(long double __v) const _NOEXCEPT size_t operator()(long double __v) const _NOEXCEPT
{ {
union {
#ifdef __LP64__
double __f;
#else
float __f;
#endif
size_t __d;
} __u;
if (__v == 0) if (__v == 0)
return 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; __u.__f = __v;
return __u.__d; return __u.__d;
} }