summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/strings/basic.string.hash/strings.pass.cpp
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2015-01-07 21:53:23 +0000
committerMarshall Clow <mclow.lists@gmail.com>2015-01-07 21:53:23 +0000
commitd95510ebba10e0d3e2d0adf352dfa5cae87b0756 (patch)
tree4be77b10cb51f633c7b6eb7878e9ce4af59ff0ee /libcxx/test/std/strings/basic.string.hash/strings.pass.cpp
parent601fa8d824de4cc2cbc42c422b25fbdfe3b7dd32 (diff)
downloadbcm5719-llvm-d95510ebba10e0d3e2d0adf352dfa5cae87b0756.tar.gz
bcm5719-llvm-d95510ebba10e0d3e2d0adf352dfa5cae87b0756.zip
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
Diffstat (limited to 'libcxx/test/std/strings/basic.string.hash/strings.pass.cpp')
-rw-r--r--libcxx/test/std/strings/basic.string.hash/strings.pass.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/test/std/strings/basic.string.hash/strings.pass.cpp b/libcxx/test/std/strings/basic.string.hash/strings.pass.cpp
index 8ba166fbbf2..5fc32c06a70 100644
--- a/libcxx/test/std/strings/basic.string.hash/strings.pass.cpp
+++ b/libcxx/test/std/strings/basic.string.hash/strings.pass.cpp
@@ -27,8 +27,8 @@ void
test()
{
typedef std::hash<T> H;
- static_assert((std::is_base_of<std::unary_function<T, std::size_t>,
- H>::value), "");
+ static_assert((std::is_same<typename H::argument_type, T>::value), "" );
+ static_assert((std::is_same<typename H::result_type, std::size_t>::value), "" );
H h;
std::string g1 = "1234567890";
std::string g2 = "1234567891";
OpenPOWER on IntegriCloud