diff options
Diffstat (limited to 'libcxx/test/std/utilities/function.objects/comparisons')
5 files changed, 15 insertions, 5 deletions
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 |
