From 601fa8d824de4cc2cbc42c422b25fbdfe3b7dd32 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Wed, 7 Jan 2015 21:51:30 +0000 Subject: In C++03, a bunch of the arithmetic/logical/comparison functors (such as negate/bit_not.pass/logical_not) were defined as deriving from unary_funtion. That restriction was removed in C++11, but the tests still check for this. Change the test to look for the embedded types first_argument/second_argument/result_type. No change to the library, just more standards-compliant tests. Thanks to STL @ Microsoft for the suggestion. llvm-svn: 225402 --- .../utilities/function.objects/logical.operations/logical_not.pass.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libcxx/test/std/utilities/function.objects/logical.operations') diff --git a/libcxx/test/std/utilities/function.objects/logical.operations/logical_not.pass.cpp b/libcxx/test/std/utilities/function.objects/logical.operations/logical_not.pass.cpp index 12b3543c5c6..8484625a727 100644 --- a/libcxx/test/std/utilities/function.objects/logical.operations/logical_not.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/logical.operations/logical_not.pass.cpp @@ -19,7 +19,8 @@ int main() { typedef std::logical_not F; const F f = F(); - static_assert((std::is_base_of, F>::value), ""); + static_assert((std::is_same::value), "" ); + static_assert((std::is_same::value), "" ); assert(!f(36)); assert(f(0)); #if _LIBCPP_STD_VER > 11 -- cgit v1.2.3