summaryrefslogtreecommitdiffstats
path: root/libcxx/test/utilities/function.objects
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-12-05 00:08:45 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-12-05 00:08:45 +0000
commitf3d14a65ca0bc0e4f7548eb643d5e55e59429b1e (patch)
treed9fc6aa99af94d687bcab7cd8048002b0607e2e0 /libcxx/test/utilities/function.objects
parent5fd147f97eb5e4935176f539017727ce74889bc9 (diff)
downloadbcm5719-llvm-f3d14a65ca0bc0e4f7548eb643d5e55e59429b1e.tar.gz
bcm5719-llvm-f3d14a65ca0bc0e4f7548eb643d5e55e59429b1e.zip
Starting using murmur2 when combining multiple size_t's into a single hash, and also for basic_string. Also made hash<thread::id> ever so slighly more portable. I had to tweak one test which is questionable (definitely not portable) anyway.
llvm-svn: 145795
Diffstat (limited to 'libcxx/test/utilities/function.objects')
-rw-r--r--libcxx/test/utilities/function.objects/unord.hash/integral.pass.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libcxx/test/utilities/function.objects/unord.hash/integral.pass.cpp b/libcxx/test/utilities/function.objects/unord.hash/integral.pass.cpp
index 358253ad677..e5f7ca61624 100644
--- a/libcxx/test/utilities/function.objects/unord.hash/integral.pass.cpp
+++ b/libcxx/test/utilities/function.objects/unord.hash/integral.pass.cpp
@@ -33,7 +33,8 @@ test()
for (int i = 0; i <= 5; ++i)
{
T t(i);
- assert(h(t) == t);
+ if (sizeof(T) <= sizeof(std::size_t))
+ assert(h(t) == t);
}
}
OpenPOWER on IntegriCloud