From 66369c03a387f6c27cc92ba6184433daa4989dd2 Mon Sep 17 00:00:00 2001
From: Marshall Clow <mclow.lists@gmail.com>
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
---
 .../utilities/function.objects/arithmetic.operations/divides.pass.cpp | 4 +++-
 .../utilities/function.objects/arithmetic.operations/minus.pass.cpp   | 4 +++-
 .../utilities/function.objects/arithmetic.operations/modulus.pass.cpp | 4 +++-
 .../function.objects/arithmetic.operations/multiplies.pass.cpp        | 4 +++-
 .../utilities/function.objects/arithmetic.operations/plus.pass.cpp    | 4 +++-
 5 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'libcxx/test/std/utilities/function.objects/arithmetic.operations')

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;
-- 
cgit v1.2.3