From 674e07d3c8f7c9c38a8e1b0aae5cfb8831a789a6 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Wed, 7 Jan 2015 21:53:23 +0000 Subject: [PATCH] libc++ implements its' hash objects as deriving from std::unary_function, and the tests test for that. STL @ MS pointed out that the standard doesn't requie these objects to derive from unary_function, and so the tests should not require that either. Change the tests to check for the embedded typedefs - which ARE required. No change to the library. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@225403 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../containers/sequences/vector.bool/vector_bool.pass.cpp | 5 +++-- .../diagnostics/syserr/syserr.hash/error_code.pass.cpp | 4 ++-- .../string.view/string.view.hash/string_view.pass.cpp | 4 ++-- test/std/strings/basic.string.hash/strings.pass.cpp | 4 ++-- .../thread.thread.id/thread_id.pass.cpp | 2 ++ .../utilities/function.objects/unord.hash/enum.pass.cpp | 7 ++++--- .../function.objects/unord.hash/floating.pass.cpp | 8 +++++--- .../function.objects/unord.hash/integral.pass.cpp | 8 +++++--- .../function.objects/unord.hash/pointer.pass.cpp | 8 +++++--- .../utilities/template.bitset/bitset.hash/bitset.pass.cpp | 4 ++-- .../type.index.synopsis/hash_type_index.pass.cpp | 5 +++-- 11 files changed, 35 insertions(+), 24 deletions(-) diff --git a/test/std/containers/sequences/vector.bool/vector_bool.pass.cpp b/test/std/containers/sequences/vector.bool/vector_bool.pass.cpp index ea2262cd9..a78f4fd59 100644 --- a/test/std/containers/sequences/vector.bool/vector_bool.pass.cpp +++ b/test/std/containers/sequences/vector.bool/vector_bool.pass.cpp @@ -29,8 +29,9 @@ int main() { typedef std::vector T; typedef std::hash H; - static_assert((std::is_base_of, - H>::value), ""); + static_assert((std::is_same::value), "" ); + static_assert((std::is_same::value), "" ); + bool ba[] = {true, false, true, true, false}; T vb(std::begin(ba), std::end(ba)); H h; diff --git a/test/std/diagnostics/syserr/syserr.hash/error_code.pass.cpp b/test/std/diagnostics/syserr/syserr.hash/error_code.pass.cpp index 14d7b2d47..b812e364b 100644 --- a/test/std/diagnostics/syserr/syserr.hash/error_code.pass.cpp +++ b/test/std/diagnostics/syserr/syserr.hash/error_code.pass.cpp @@ -27,8 +27,8 @@ test(int i) { typedef std::error_code T; typedef std::hash H; - static_assert((std::is_base_of, - H>::value), ""); + static_assert((std::is_same::value), "" ); + static_assert((std::is_same::value), "" ); H h; T ec(i, std::system_category()); assert(h(ec) == i); diff --git a/test/std/experimental/string.view/string.view.hash/string_view.pass.cpp b/test/std/experimental/string.view/string.view.hash/string_view.pass.cpp index 03e0db2db..6b16971bf 100644 --- a/test/std/experimental/string.view/string.view.hash/string_view.pass.cpp +++ b/test/std/experimental/string.view/string.view.hash/string_view.pass.cpp @@ -29,8 +29,8 @@ void test() { typedef std::hash H; - static_assert((std::is_base_of, - H>::value), ""); + static_assert((std::is_same::value), "" ); + static_assert((std::is_same::value), "" ); H h; // std::string g1 = "1234567890"; // std::string g2 = "1234567891"; diff --git a/test/std/strings/basic.string.hash/strings.pass.cpp b/test/std/strings/basic.string.hash/strings.pass.cpp index 8ba166fbb..5fc32c06a 100644 --- a/test/std/strings/basic.string.hash/strings.pass.cpp +++ b/test/std/strings/basic.string.hash/strings.pass.cpp @@ -27,8 +27,8 @@ void test() { typedef std::hash H; - static_assert((std::is_base_of, - H>::value), ""); + static_assert((std::is_same::value), "" ); + static_assert((std::is_same::value), "" ); H h; std::string g1 = "1234567890"; std::string g2 = "1234567891"; diff --git a/test/std/thread/thread.threads/thread.thread.class/thread.thread.id/thread_id.pass.cpp b/test/std/thread/thread.threads/thread.thread.class/thread.thread.id/thread_id.pass.cpp index bb7f2aa0d..106c69e2e 100644 --- a/test/std/thread/thread.threads/thread.thread.class/thread.thread.id/thread_id.pass.cpp +++ b/test/std/thread/thread.threads/thread.thread.class/thread.thread.id/thread_id.pass.cpp @@ -28,6 +28,8 @@ int main() std::thread::id id1; std::thread::id id2 = std::this_thread::get_id(); typedef std::hash H; + static_assert((std::is_same::value), "" ); + static_assert((std::is_same::value), "" ); H h; assert(h(id1) != h(id2)); } diff --git a/test/std/utilities/function.objects/unord.hash/enum.pass.cpp b/test/std/utilities/function.objects/unord.hash/enum.pass.cpp index b5cd6f845..4dbd7b0d8 100644 --- a/test/std/utilities/function.objects/unord.hash/enum.pass.cpp +++ b/test/std/utilities/function.objects/unord.hash/enum.pass.cpp @@ -33,11 +33,12 @@ template void test() { - static_assert((std::is_base_of, - std::hash >::value), ""); + typedef std::hash H; + static_assert((std::is_same::value), "" ); + static_assert((std::is_same::value), "" ); typedef typename std::underlying_type::type under_type; - std::hash h1; + H h1; std::hash h2; for (int i = 0; i <= 5; ++i) { diff --git a/test/std/utilities/function.objects/unord.hash/floating.pass.cpp b/test/std/utilities/function.objects/unord.hash/floating.pass.cpp index 988950d4d..f1f198f23 100644 --- a/test/std/utilities/function.objects/unord.hash/floating.pass.cpp +++ b/test/std/utilities/function.objects/unord.hash/floating.pass.cpp @@ -28,9 +28,11 @@ template void test() { - static_assert((std::is_base_of, - std::hash >::value), ""); - std::hash h; + typedef std::hash H; + static_assert((std::is_same::value), "" ); + static_assert((std::is_same::value), "" ); + H h; + std::size_t t0 = h(0.); std::size_t tn0 = h(-0.); std::size_t tp1 = h(0.1); diff --git a/test/std/utilities/function.objects/unord.hash/integral.pass.cpp b/test/std/utilities/function.objects/unord.hash/integral.pass.cpp index e5f7ca616..7cd9f15e9 100644 --- a/test/std/utilities/function.objects/unord.hash/integral.pass.cpp +++ b/test/std/utilities/function.objects/unord.hash/integral.pass.cpp @@ -27,9 +27,11 @@ template void test() { - static_assert((std::is_base_of, - std::hash >::value), ""); - std::hash h; + typedef std::hash H; + static_assert((std::is_same::value), "" ); + static_assert((std::is_same::value), "" ); + H h; + for (int i = 0; i <= 5; ++i) { T t(i); diff --git a/test/std/utilities/function.objects/unord.hash/pointer.pass.cpp b/test/std/utilities/function.objects/unord.hash/pointer.pass.cpp index e4e011295..a48394495 100644 --- a/test/std/utilities/function.objects/unord.hash/pointer.pass.cpp +++ b/test/std/utilities/function.objects/unord.hash/pointer.pass.cpp @@ -27,9 +27,11 @@ template void test() { - static_assert((std::is_base_of, - std::hash >::value), ""); - std::hash h; + typedef std::hash H; + static_assert((std::is_same::value), "" ); + static_assert((std::is_same::value), "" ); + H h; + typedef typename std::remove_pointer::type type; type i; type j; diff --git a/test/std/utilities/template.bitset/bitset.hash/bitset.pass.cpp b/test/std/utilities/template.bitset/bitset.hash/bitset.pass.cpp index b1b24f96f..520f2e875 100644 --- a/test/std/utilities/template.bitset/bitset.hash/bitset.pass.cpp +++ b/test/std/utilities/template.bitset/bitset.hash/bitset.pass.cpp @@ -28,8 +28,8 @@ test() { typedef std::bitset T; typedef std::hash H; - static_assert((std::is_base_of, - H>::value), ""); + static_assert((std::is_same::value), "" ); + static_assert((std::is_same::value), "" ); H h; T bs(static_cast(N)); assert(h(bs) == N); diff --git a/test/std/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp b/test/std/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp index b855d1254..6d353f1d3 100644 --- a/test/std/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp +++ b/test/std/utilities/type.index/type.index.synopsis/hash_type_index.pass.cpp @@ -20,6 +20,7 @@ int main() { - static_assert((std::is_base_of, - std::hash >::value), ""); + typedef std::hash H; + static_assert((std::is_same::value), "" ); + static_assert((std::is_same::value), "" ); }