From 66369c03a387f6c27cc92ba6184433daa4989dd2 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Wed, 7 Jan 2015 20:31:06 +0000 Subject: In C++03, a bunch of the arithmetic/logical/comparison functors (such as add/equal_to/logical_or) were defined as deriving from binary_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: 225375 --- .../std/utilities/function.objects/bitwise.operations/bit_or.pass.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libcxx/test/std/utilities/function.objects/bitwise.operations/bit_or.pass.cpp') diff --git a/libcxx/test/std/utilities/function.objects/bitwise.operations/bit_or.pass.cpp b/libcxx/test/std/utilities/function.objects/bitwise.operations/bit_or.pass.cpp index 6ae3c3ac978..cb33df3d84b 100644 --- a/libcxx/test/std/utilities/function.objects/bitwise.operations/bit_or.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/bitwise.operations/bit_or.pass.cpp @@ -19,7 +19,9 @@ int main() { typedef std::bit_or 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), "" ); + static_assert((std::is_same::value), "" ); assert(f(0xEA95, 0xEA95) == 0xEA95); assert(f(0xEA95, 0x58D3) == 0xFAD7); assert(f(0x58D3, 0xEA95) == 0xFAD7); -- cgit v1.2.3