Make the comparison objects that we pass in for various tests look more like actual comparison objects. No functional change.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@272288 91177308-0d34-0410-b5e6-96231b3b80d8

test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp

@@ -28,6 +28,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp();
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 int main()

test/std/containers/associative/map/map.cons/dtor_noexcept.pass.cpp

@@ -24,6 +24,7 @@ struct some_comp
 {
     typedef T value_type;
     ~some_comp() noexcept(false);
+    bool operator()(const T&, const T&) const noexcept { return false; }
 };
 
 #endif

test/std/containers/associative/map/map.cons/move_assign_noexcept.pass.cpp

@@ -28,6 +28,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp& operator=(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 int main()

test/std/containers/associative/map/map.cons/move_noexcept.pass.cpp

@@ -26,6 +26,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 int main()

test/std/containers/associative/map/map.special/swap_noexcept.pass.cpp

@@ -35,9 +35,7 @@ struct some_comp
 
     some_comp() {}
     some_comp(const some_comp&) {}
-    void deallocate(void*, unsigned) {}
+    bool operator()(const T&, const T&) const { return false; }
-
-    typedef std::true_type propagate_on_container_swap;
 };
 
 template <class T>
@@ -47,8 +45,7 @@ struct some_comp2
 
     some_comp2() {}
     some_comp2(const some_comp2&) {}
-    void deallocate(void*, unsigned) {}
+    bool operator()(const T&, const T&) const { return false; }
-    typedef std::true_type propagate_on_container_swap;
 };
 
 #if TEST_STD_VER >= 14

test/std/containers/associative/multimap/multimap.cons/default_noexcept.pass.cpp

@@ -28,6 +28,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp();
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 int main()

test/std/containers/associative/multimap/multimap.cons/dtor_noexcept.pass.cpp

@@ -24,6 +24,7 @@ struct some_comp
 {
     typedef T value_type;
     ~some_comp() noexcept(false);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 #endif

test/std/containers/associative/multimap/multimap.cons/move_assign_noexcept.pass.cpp

@@ -28,6 +28,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp& operator=(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 int main()

test/std/containers/associative/multimap/multimap.cons/move_noexcept.pass.cpp

@@ -26,6 +26,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 int main()

test/std/containers/associative/multimap/multimap.special/swap_noexcept.pass.cpp

@@ -35,9 +35,7 @@ struct some_comp
 
     some_comp() {}
     some_comp(const some_comp&) {}
-    void deallocate(void*, unsigned) {}
+    bool operator()(const T&, const T&) const { return false; }
-
-    typedef std::true_type propagate_on_container_swap;
 };
 
 template <class T>
@@ -47,8 +45,7 @@ struct some_comp2
 
     some_comp2() {}
     some_comp2(const some_comp2&) {}
-    void deallocate(void*, unsigned) {}
+    bool operator()(const T&, const T&) const { return false; }
-    typedef std::true_type propagate_on_container_swap;
 };
 
 #if TEST_STD_VER >= 14

test/std/containers/associative/multiset/multiset.cons/default_noexcept.pass.cpp

@@ -28,6 +28,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp();
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 int main()

test/std/containers/associative/multiset/multiset.cons/dtor_noexcept.pass.cpp

@@ -24,6 +24,7 @@ struct some_comp
 {
     typedef T value_type;
     ~some_comp() noexcept(false);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 #endif

test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp

@@ -28,6 +28,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp& operator=(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 int main()

test/std/containers/associative/multiset/multiset.cons/move_noexcept.pass.cpp

@@ -26,6 +26,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 int main()

test/std/containers/associative/multiset/multiset.special/swap_noexcept.pass.cpp

@@ -35,9 +35,7 @@ struct some_comp
 
     some_comp() {}
     some_comp(const some_comp&) {}
-    void deallocate(void*, unsigned) {}
+    bool operator()(const T&, const T&) const { return false; }
-
-    typedef std::true_type propagate_on_container_swap;
 };
 
 template <class T>
@@ -47,8 +45,7 @@ struct some_comp2
 
     some_comp2() {}
     some_comp2(const some_comp2&) {}
-    void deallocate(void*, unsigned) {}
+    bool operator()(const T&, const T&) const { return false; }
-    typedef std::true_type propagate_on_container_swap;
 };
 
 #if TEST_STD_VER >= 14

test/std/containers/associative/set/set.cons/default_noexcept.pass.cpp

@@ -28,6 +28,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp();
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 int main()

test/std/containers/associative/set/set.cons/dtor_noexcept.pass.cpp

@@ -24,6 +24,7 @@ struct some_comp
 {
     typedef T value_type;
     ~some_comp() noexcept(false);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 #endif

test/std/containers/associative/set/set.cons/move_assign_noexcept.pass.cpp

@@ -28,6 +28,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp& operator=(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 int main()

test/std/containers/associative/set/set.cons/move_noexcept.pass.cpp

@@ -26,6 +26,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 int main()

test/std/containers/associative/set/set.special/swap_noexcept.pass.cpp

@@ -35,9 +35,7 @@ struct some_comp
 
     some_comp() {}
     some_comp(const some_comp&) {}
-    void deallocate(void*, unsigned) {}
+    bool operator()(const T&, const T&) const { return false; }
-
-    typedef std::true_type propagate_on_container_swap;
 };
 
 template <class T>
@@ -47,8 +45,7 @@ struct some_comp2
 
     some_comp2() {}
     some_comp2(const some_comp2&) {}
-    void deallocate(void*, unsigned) {}
+    bool operator()(const T&, const T&) const { return false; }
-    typedef std::true_type propagate_on_container_swap;
 };
 
 #if TEST_STD_VER >= 14

test/std/containers/unord/unord.map/unord.map.cnstr/default_noexcept.pass.cpp

@@ -30,6 +30,7 @@ struct some_comp
     typedef T value_type;
     some_comp();
     some_comp(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>

test/std/containers/unord/unord.map/unord.map.cnstr/dtor_noexcept.pass.cpp

@@ -24,6 +24,7 @@ struct some_comp
 {
     typedef T value_type;
     ~some_comp() noexcept(false);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>

test/std/containers/unord/unord.map/unord.map.cnstr/move_assign_noexcept.pass.cpp

@@ -28,6 +28,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp& operator=(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>

test/std/containers/unord/unord.map/unord.map.cnstr/move_noexcept.pass.cpp

@@ -26,6 +26,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>

test/std/containers/unord/unord.map/unord.map.swap/swap_noexcept.pass.cpp

@@ -39,6 +39,7 @@ struct some_comp
 
     some_comp() {}
     some_comp(const some_comp&) {}
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>
@@ -48,8 +49,7 @@ struct some_comp2
 
     some_comp2() {}
     some_comp2(const some_comp2&) {}
-    void deallocate(void*, unsigned) {}
+    bool operator()(const T&, const T&) const { return false; }
-    typedef std::true_type propagate_on_container_swap;
 };
 
 #if TEST_STD_VER >= 14

test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp

@@ -30,6 +30,7 @@ struct some_comp
     typedef T value_type;
     some_comp();
     some_comp(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>

test/std/containers/unord/unord.multimap/unord.multimap.cnstr/dtor_noexcept.pass.cpp

@@ -24,6 +24,7 @@ struct some_comp
 {
     typedef T value_type;
     ~some_comp() noexcept(false);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>

test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_assign_noexcept.pass.cpp

@@ -28,6 +28,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp& operator=(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>

test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp

@@ -26,6 +26,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>

test/std/containers/unord/unord.multimap/unord.multimap.swap/swap_noexcept.pass.cpp

@@ -39,6 +39,7 @@ struct some_comp
 
     some_comp() {}
     some_comp(const some_comp&) {}
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>
@@ -48,8 +49,7 @@ struct some_comp2
 
     some_comp2() {}
     some_comp2(const some_comp2&) {}
-    void deallocate(void*, unsigned) {}
+    bool operator()(const T&, const T&) const { return false; }
-    typedef std::true_type propagate_on_container_swap;
 };
 
 #if TEST_STD_VER >= 14

test/std/containers/unord/unord.multiset/unord.multiset.cnstr/default_noexcept.pass.cpp

@@ -30,6 +30,7 @@ struct some_comp
     typedef T value_type;
     some_comp();
     some_comp(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>

test/std/containers/unord/unord.multiset/unord.multiset.cnstr/dtor_noexcept.pass.cpp

@@ -24,6 +24,7 @@ struct some_comp
 {
     typedef T value_type;
     ~some_comp() noexcept(false);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>

test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_assign_noexcept.pass.cpp

@@ -28,6 +28,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp& operator=(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>

test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_noexcept.pass.cpp

@@ -26,6 +26,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>

test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp

@@ -39,6 +39,7 @@ struct some_comp
 
     some_comp() {}
     some_comp(const some_comp&) {}
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>
@@ -48,8 +49,7 @@ struct some_comp2
 
     some_comp2() {}
     some_comp2(const some_comp2&) {}
-    void deallocate(void*, unsigned) {}
+    bool operator()(const T&, const T&) const { return false; }
-    typedef std::true_type propagate_on_container_swap;
 };
 
 #if TEST_STD_VER >= 14

test/std/containers/unord/unord.set/unord.set.cnstr/default_noexcept.pass.cpp

@@ -30,6 +30,7 @@ struct some_comp
     typedef T value_type;
     some_comp();
     some_comp(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>

test/std/containers/unord/unord.set/unord.set.cnstr/dtor_noexcept.pass.cpp

@@ -24,6 +24,7 @@ struct some_comp
 {
     typedef T value_type;
     ~some_comp() noexcept(false);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>

test/std/containers/unord/unord.set/unord.set.cnstr/move_assign_noexcept.pass.cpp

@@ -28,6 +28,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp& operator=(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>

test/std/containers/unord/unord.set/unord.set.cnstr/move_noexcept.pass.cpp

@@ -26,6 +26,7 @@ struct some_comp
 {
     typedef T value_type;
     some_comp(const some_comp&);
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>

test/std/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp

@@ -39,6 +39,7 @@ struct some_comp
 
     some_comp() {}
     some_comp(const some_comp&) {}
+    bool operator()(const T&, const T&) const { return false; }
 };
 
 template <class T>
@@ -48,8 +49,7 @@ struct some_comp2
 
     some_comp2() {}
     some_comp2(const some_comp2&) {}
-    void deallocate(void*, unsigned) {}
+    bool operator()(const T&, const T&) const { return false; }
-    typedef std::true_type propagate_on_container_swap;
 };
 
 #if TEST_STD_VER >= 14