diff options
Diffstat (limited to 'libcxx/test/std/utilities/function.objects')
16 files changed, 48 insertions, 16 deletions
diff --git a/libcxx/test/std/utilities/function.objects/arithmetic.operations/divides.pass.cpp b/libcxx/test/std/utilities/function.objects/arithmetic.operations/divides.pass.cpp index 74298f23b7c..490dc16b60e 100644 --- a/libcxx/test/std/utilities/function.objects/arithmetic.operations/divides.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/arithmetic.operations/divides.pass.cpp @@ -19,7 +19,9 @@ int main() { typedef std::divides<int> F; const F f = F(); - static_assert((std::is_base_of<std::binary_function<int, int, int>, F>::value), ""); + static_assert((std::is_same<int, F::first_argument_type>::value), "" ); + static_assert((std::is_same<int, F::second_argument_type>::value), "" ); + static_assert((std::is_same<int, F::result_type>::value), "" ); assert(f(36, 4) == 9); #if _LIBCPP_STD_VER > 11 typedef std::divides<> F2; diff --git a/libcxx/test/std/utilities/function.objects/arithmetic.operations/minus.pass.cpp b/libcxx/test/std/utilities/function.objects/arithmetic.operations/minus.pass.cpp index 9a496a8066c..9bda541f896 100644 --- a/libcxx/test/std/utilities/function.objects/arithmetic.operations/minus.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/arithmetic.operations/minus.pass.cpp @@ -19,7 +19,9 @@ int main() { typedef std::minus<int> F; const F f = F(); - static_assert((std::is_base_of<std::binary_function<int, int, int>, F>::value), ""); + static_assert((std::is_same<int, F::first_argument_type>::value), "" ); + static_assert((std::is_same<int, F::second_argument_type>::value), "" ); + static_assert((std::is_same<int, F::result_type>::value), "" ); assert(f(3, 2) == 1); #if _LIBCPP_STD_VER > 11 typedef std::minus<> F2; diff --git a/libcxx/test/std/utilities/function.objects/arithmetic.operations/modulus.pass.cpp b/libcxx/test/std/utilities/function.objects/arithmetic.operations/modulus.pass.cpp index 3c178819231..ca5bba6d5b8 100644 --- a/libcxx/test/std/utilities/function.objects/arithmetic.operations/modulus.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/arithmetic.operations/modulus.pass.cpp @@ -19,7 +19,9 @@ int main() { typedef std::modulus<int> F; const F f = F(); - static_assert((std::is_base_of<std::binary_function<int, int, int>, F>::value), ""); + static_assert((std::is_same<int, F::first_argument_type>::value), "" ); + static_assert((std::is_same<int, F::second_argument_type>::value), "" ); + static_assert((std::is_same<int, F::result_type>::value), "" ); assert(f(36, 8) == 4); #if _LIBCPP_STD_VER > 11 typedef std::modulus<> F2; diff --git a/libcxx/test/std/utilities/function.objects/arithmetic.operations/multiplies.pass.cpp b/libcxx/test/std/utilities/function.objects/arithmetic.operations/multiplies.pass.cpp index 97287e6c8da..f132c8d4bd9 100644 --- a/libcxx/test/std/utilities/function.objects/arithmetic.operations/multiplies.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/arithmetic.operations/multiplies.pass.cpp @@ -19,7 +19,9 @@ int main() { typedef std::multiplies<int> F; const F f = F(); - static_assert((std::is_base_of<std::binary_function<int, int, int>, F>::value), ""); + static_assert((std::is_same<int, F::first_argument_type>::value), "" ); + static_assert((std::is_same<int, F::second_argument_type>::value), "" ); + static_assert((std::is_same<int, F::result_type>::value), "" ); assert(f(3, 2) == 6); #if _LIBCPP_STD_VER > 11 typedef std::multiplies<> F2; diff --git a/libcxx/test/std/utilities/function.objects/arithmetic.operations/plus.pass.cpp b/libcxx/test/std/utilities/function.objects/arithmetic.operations/plus.pass.cpp index 44001a0e5f4..3c093fc093c 100644 --- a/libcxx/test/std/utilities/function.objects/arithmetic.operations/plus.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/arithmetic.operations/plus.pass.cpp @@ -19,7 +19,9 @@ int main() { typedef std::plus<int> F; const F f = F(); - static_assert((std::is_base_of<std::binary_function<int, int, int>, F>::value), ""); + static_assert((std::is_same<int, F::first_argument_type>::value), "" ); + static_assert((std::is_same<int, F::second_argument_type>::value), "" ); + static_assert((std::is_same<int, F::result_type>::value), "" ); assert(f(3, 2) == 5); #if _LIBCPP_STD_VER > 11 typedef std::plus<> F2; diff --git a/libcxx/test/std/utilities/function.objects/bitwise.operations/bit_and.pass.cpp b/libcxx/test/std/utilities/function.objects/bitwise.operations/bit_and.pass.cpp index 66544781d9d..c0135fad198 100644 --- a/libcxx/test/std/utilities/function.objects/bitwise.operations/bit_and.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/bitwise.operations/bit_and.pass.cpp @@ -19,7 +19,9 @@ int main() { typedef std::bit_and<int> F; const F f = F(); - static_assert((std::is_base_of<std::binary_function<int, int, int>, F>::value), ""); + static_assert((std::is_same<int, F::first_argument_type>::value), "" ); + static_assert((std::is_same<int, F::second_argument_type>::value), "" ); + static_assert((std::is_same<int, F::result_type>::value), "" ); assert(f(0xEA95, 0xEA95) == 0xEA95); assert(f(0xEA95, 0x58D3) == 0x4891); assert(f(0x58D3, 0xEA95) == 0x4891); 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<int> F; const F f = F(); - static_assert((std::is_base_of<std::binary_function<int, int, int>, F>::value), ""); + static_assert((std::is_same<int, F::first_argument_type>::value), "" ); + static_assert((std::is_same<int, F::second_argument_type>::value), "" ); + static_assert((std::is_same<int, F::result_type>::value), "" ); assert(f(0xEA95, 0xEA95) == 0xEA95); assert(f(0xEA95, 0x58D3) == 0xFAD7); assert(f(0x58D3, 0xEA95) == 0xFAD7); diff --git a/libcxx/test/std/utilities/function.objects/bitwise.operations/bit_xor.pass.cpp b/libcxx/test/std/utilities/function.objects/bitwise.operations/bit_xor.pass.cpp index e7bb5e49f94..d8690aa8268 100644 --- a/libcxx/test/std/utilities/function.objects/bitwise.operations/bit_xor.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/bitwise.operations/bit_xor.pass.cpp @@ -19,7 +19,9 @@ int main() { typedef std::bit_xor<int> F; const F f = F(); - static_assert((std::is_base_of<std::binary_function<int, int, int>, F>::value), ""); + static_assert((std::is_same<int, F::first_argument_type>::value), "" ); + static_assert((std::is_same<int, F::second_argument_type>::value), "" ); + static_assert((std::is_same<int, F::result_type>::value), "" ); assert(f(0xEA95, 0xEA95) == 0); assert(f(0xEA95, 0x58D3) == 0xB246); assert(f(0x58D3, 0xEA95) == 0xB246); diff --git a/libcxx/test/std/utilities/function.objects/comparisons/equal_to.pass.cpp b/libcxx/test/std/utilities/function.objects/comparisons/equal_to.pass.cpp index 3d1c0b5cecd..60415ec75d6 100644 --- a/libcxx/test/std/utilities/function.objects/comparisons/equal_to.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/comparisons/equal_to.pass.cpp @@ -19,7 +19,9 @@ int main() { typedef std::equal_to<int> F; const F f = F(); - static_assert((std::is_base_of<std::binary_function<int, int, bool>, F>::value), ""); + static_assert((std::is_same<int, F::first_argument_type>::value), "" ); + static_assert((std::is_same<int, F::second_argument_type>::value), "" ); + static_assert((std::is_same<bool, F::result_type>::value), "" ); assert(f(36, 36)); assert(!f(36, 6)); #if _LIBCPP_STD_VER > 11 diff --git a/libcxx/test/std/utilities/function.objects/comparisons/greater.pass.cpp b/libcxx/test/std/utilities/function.objects/comparisons/greater.pass.cpp index 5a88f4362dc..164f09aa605 100644 --- a/libcxx/test/std/utilities/function.objects/comparisons/greater.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/comparisons/greater.pass.cpp @@ -19,7 +19,9 @@ int main() { typedef std::greater<int> F; const F f = F(); - static_assert((std::is_base_of<std::binary_function<int, int, bool>, F>::value), ""); + static_assert((std::is_same<int, F::first_argument_type>::value), "" ); + static_assert((std::is_same<int, F::second_argument_type>::value), "" ); + static_assert((std::is_same<bool, F::result_type>::value), "" ); assert(!f(36, 36)); assert(f(36, 6)); assert(!f(6, 36)); diff --git a/libcxx/test/std/utilities/function.objects/comparisons/greater_equal.pass.cpp b/libcxx/test/std/utilities/function.objects/comparisons/greater_equal.pass.cpp index 22444c79420..e89c14e2462 100644 --- a/libcxx/test/std/utilities/function.objects/comparisons/greater_equal.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/comparisons/greater_equal.pass.cpp @@ -19,7 +19,9 @@ int main() { typedef std::greater_equal<int> F; const F f = F(); - static_assert((std::is_base_of<std::binary_function<int, int, bool>, F>::value), ""); + static_assert((std::is_same<int, F::first_argument_type>::value), "" ); + static_assert((std::is_same<int, F::second_argument_type>::value), "" ); + static_assert((std::is_same<bool, F::result_type>::value), "" ); assert(f(36, 36)); assert(f(36, 6)); assert(!f(6, 36)); diff --git a/libcxx/test/std/utilities/function.objects/comparisons/less_equal.pass.cpp b/libcxx/test/std/utilities/function.objects/comparisons/less_equal.pass.cpp index 116906eaafe..e6ba1f7f8a2 100644 --- a/libcxx/test/std/utilities/function.objects/comparisons/less_equal.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/comparisons/less_equal.pass.cpp @@ -19,7 +19,9 @@ int main() { typedef std::less_equal<int> F; const F f = F(); - static_assert((std::is_base_of<std::binary_function<int, int, bool>, F>::value), ""); + static_assert((std::is_same<int, F::first_argument_type>::value), "" ); + static_assert((std::is_same<int, F::second_argument_type>::value), "" ); + static_assert((std::is_same<bool, F::result_type>::value), "" ); assert(f(36, 36)); assert(!f(36, 6)); assert(f(6, 36)); diff --git a/libcxx/test/std/utilities/function.objects/comparisons/not_equal_to.pass.cpp b/libcxx/test/std/utilities/function.objects/comparisons/not_equal_to.pass.cpp index 4b61bf8b838..3e710b3e0c7 100644 --- a/libcxx/test/std/utilities/function.objects/comparisons/not_equal_to.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/comparisons/not_equal_to.pass.cpp @@ -19,7 +19,9 @@ int main() { typedef std::not_equal_to<int> F; const F f = F(); - static_assert((std::is_base_of<std::binary_function<int, int, bool>, F>::value), ""); + static_assert((std::is_same<int, F::first_argument_type>::value), "" ); + static_assert((std::is_same<int, F::second_argument_type>::value), "" ); + static_assert((std::is_same<bool, F::result_type>::value), "" ); assert(!f(36, 36)); assert(f(36, 6)); #if _LIBCPP_STD_VER > 11 diff --git a/libcxx/test/std/utilities/function.objects/logical.operations/logical_and.pass.cpp b/libcxx/test/std/utilities/function.objects/logical.operations/logical_and.pass.cpp index c7b03cce095..72f9dc20144 100644 --- a/libcxx/test/std/utilities/function.objects/logical.operations/logical_and.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/logical.operations/logical_and.pass.cpp @@ -19,7 +19,9 @@ int main() { typedef std::logical_and<int> F; const F f = F(); - static_assert((std::is_base_of<std::binary_function<int, int, bool>, F>::value), ""); + static_assert((std::is_same<int, F::first_argument_type>::value), "" ); + static_assert((std::is_same<int, F::second_argument_type>::value), "" ); + static_assert((std::is_same<bool, F::result_type>::value), "" ); assert(f(36, 36)); assert(!f(36, 0)); assert(!f(0, 36)); diff --git a/libcxx/test/std/utilities/function.objects/logical.operations/logical_or.pass.cpp b/libcxx/test/std/utilities/function.objects/logical.operations/logical_or.pass.cpp index 8b5420d8e04..7280504403f 100644 --- a/libcxx/test/std/utilities/function.objects/logical.operations/logical_or.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/logical.operations/logical_or.pass.cpp @@ -19,7 +19,9 @@ int main() { typedef std::logical_or<int> F; const F f = F(); - static_assert((std::is_base_of<std::binary_function<int, int, bool>, F>::value), ""); + static_assert((std::is_same<int, F::first_argument_type>::value), "" ); + static_assert((std::is_same<int, F::second_argument_type>::value), "" ); + static_assert((std::is_same<bool, F::result_type>::value), "" ); assert(f(36, 36)); assert(f(36, 0)); assert(f(0, 36)); diff --git a/libcxx/test/std/utilities/function.objects/negators/binary_negate.pass.cpp b/libcxx/test/std/utilities/function.objects/negators/binary_negate.pass.cpp index e30670836c5..53ff5b47a3a 100644 --- a/libcxx/test/std/utilities/function.objects/negators/binary_negate.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/negators/binary_negate.pass.cpp @@ -19,7 +19,9 @@ int main() { typedef std::binary_negate<std::logical_and<int> > F; const F f = F(std::logical_and<int>()); - static_assert((std::is_base_of<std::binary_function<int, int, bool>, F>::value), ""); + static_assert((std::is_same<int, F::first_argument_type>::value), "" ); + static_assert((std::is_same<int, F::second_argument_type>::value), "" ); + static_assert((std::is_same<bool, F::result_type>::value), "" ); assert(!f(36, 36)); assert( f(36, 0)); assert( f(0, 36)); |
