From d95510ebba10e0d3e2d0adf352dfa5cae87b0756 Mon Sep 17 00:00:00 2001
From: Marshall Clow <mclow.lists@gmail.com>
Date: Wed, 7 Jan 2015 21:53:23 +0000
Subject: 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.

llvm-svn: 225403
---
 .../test/std/utilities/function.objects/unord.hash/enum.pass.cpp   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'libcxx/test/std/utilities/function.objects/unord.hash/enum.pass.cpp')

diff --git a/libcxx/test/std/utilities/function.objects/unord.hash/enum.pass.cpp b/libcxx/test/std/utilities/function.objects/unord.hash/enum.pass.cpp
index b5cd6f8454d..4dbd7b0d810 100644
--- a/libcxx/test/std/utilities/function.objects/unord.hash/enum.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/unord.hash/enum.pass.cpp
@@ -33,11 +33,12 @@ template <class T>
 void
 test()
 {
-    static_assert((std::is_base_of<std::unary_function<T, std::size_t>,
-                                   std::hash<T> >::value), "");
+    typedef std::hash<T> H;
+    static_assert((std::is_same<H::argument_type, T>::value), "" );
+    static_assert((std::is_same<H::result_type, std::size_t>::value), "" );
     typedef typename std::underlying_type<T>::type under_type;
     
-    std::hash<T> h1;
+    H h1;
     std::hash<under_type> h2;
     for (int i = 0; i <= 5; ++i)
     {
-- 
cgit v1.2.3