summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-06-30 04:28:12 +0000
committerEric Fiselier <eric@efcs.ca>2016-06-30 04:28:12 +0000
commit3b0184321fd2369497d4d3269000175f9985cbbb (patch)
tree8cb33f6d1189c1e8114c8ede08bf7ac828966707
parent2bbb125d4e6d98d8508058935504807b88521225 (diff)
downloadbcm5719-llvm-3b0184321fd2369497d4d3269000175f9985cbbb.tar.gz
bcm5719-llvm-3b0184321fd2369497d4d3269000175f9985cbbb.zip
Fix unary_function inheritance assumption. Patch from STL@microsoft.com
llvm-svn: 274205
-rw-r--r--libcxx/test/std/containers/sequences/vector.bool/vector_bool.pass.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/test/std/containers/sequences/vector.bool/vector_bool.pass.cpp b/libcxx/test/std/containers/sequences/vector.bool/vector_bool.pass.cpp
index d48efb973fb..4f82792fa1f 100644
--- a/libcxx/test/std/containers/sequences/vector.bool/vector_bool.pass.cpp
+++ b/libcxx/test/std/containers/sequences/vector.bool/vector_bool.pass.cpp
@@ -41,8 +41,8 @@ int main()
{
typedef std::vector<bool, min_allocator<bool>> T;
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<H::argument_type, T>::value), "" );
+ static_assert((std::is_same<H::result_type, std::size_t>::value), "" );
bool ba[] = {true, false, true, true, false};
T vb(std::begin(ba), std::end(ba));
H h;
OpenPOWER on IntegriCloud