STL_MSFT created this revision.

[libcxx] [test] Update for C++17 feature removals.

test/std/containers/Emplaceable.h
test/std/containers/NotConstructible.h
test/support/counting_predicates.hpp
Replace unary_function/binary_function inheritance with typedefs.

test/std/depr/depr.function.objects/depr.base/binary_function.pass.cpp
test/std/depr/depr.function.objects/depr.base/unary_function.pass.cpp
test/std/utilities/function.objects/func.require/binary_function.pass.cpp
test/std/utilities/function.objects/func.require/unary_function.pass.cpp
Mark these tests as requiring 98/03/11/14 because 17 removed 
unary_function/binary_function.

test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp
test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp
Mark these tests as requiring 11/14 because 17 removed packaged_task allocator 
support.

test/std/utilities/function.objects/func.wrap/func.wrap.func/derive_from.pass.cpp
This test doesn't need to be skipped in C++17 mode. Only the construction of
std::function from an allocator needs to be skipped in C++17 mode.

test/std/utilities/function.objects/refwrap/refwrap.access/conversion.pass.cpp
test/std/utilities/function.objects/refwrap/refwrap.assign/copy_assign.pass.cpp
test/std/utilities/function.objects/refwrap/refwrap.const/copy_ctor.pass.cpp
test/std/utilities/function.objects/refwrap/refwrap.const/type_ctor.pass.cpp
When testing these reference_wrapper features, unary_function inheritance is 
totally irrelevant.

test/std/utilities/function.objects/refwrap/weak_result.pass.cpp
Define and use my_unary_function/my_binary_function to test the weak result 
type machinery
(which is still present in C++17, although deprecated).

test/support/msvc_stdlib_force_include.hpp
Now we can test C++17 strictly, without enabling removed features.


https://reviews.llvm.org/D36503

Files:
  test/std/containers/Emplaceable.h
  test/std/containers/NotConstructible.h
  test/std/depr/depr.function.objects/depr.base/binary_function.pass.cpp
  test/std/depr/depr.function.objects/depr.base/unary_function.pass.cpp
  
test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp
  
test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp
  test/std/utilities/function.objects/func.require/binary_function.pass.cpp
  test/std/utilities/function.objects/func.require/unary_function.pass.cpp
  
test/std/utilities/function.objects/func.wrap/func.wrap.func/derive_from.pass.cpp
  test/std/utilities/function.objects/refwrap/refwrap.access/conversion.pass.cpp
  
test/std/utilities/function.objects/refwrap/refwrap.assign/copy_assign.pass.cpp
  test/std/utilities/function.objects/refwrap/refwrap.const/copy_ctor.pass.cpp
  test/std/utilities/function.objects/refwrap/refwrap.const/type_ctor.pass.cpp
  test/std/utilities/function.objects/refwrap/weak_result.pass.cpp
  test/support/counting_predicates.hpp
  test/support/msvc_stdlib_force_include.hpp

Index: test/support/msvc_stdlib_force_include.hpp
===================================================================
--- test/support/msvc_stdlib_force_include.hpp
+++ test/support/msvc_stdlib_force_include.hpp
@@ -69,12 +69,6 @@
     // atomic_is_lock_free.pass.cpp needs this VS 2015 Update 2 fix.
     #define _ENABLE_ATOMIC_ALIGNMENT_FIX
 
-    // Enable features that /std:c++latest removes by default.
-    #define _HAS_AUTO_PTR_ETC               1
-    #define _HAS_FUNCTION_ALLOCATOR_SUPPORT 1
-    #define _HAS_OLD_IOSTREAMS_MEMBERS      1
-    #define _HAS_UNEXPECTED                 1
-
     // Silence warnings about raw pointers and other unchecked iterators.
     #define _SCL_SECURE_NO_WARNINGS
 
Index: test/support/counting_predicates.hpp
===================================================================
--- test/support/counting_predicates.hpp
+++ test/support/counting_predicates.hpp
@@ -12,8 +12,11 @@
 
 
 template <typename Predicate, typename Arg>
-struct unary_counting_predicate : public std::unary_function<Arg, bool>  {
+struct unary_counting_predicate {
 public:
+    typedef Arg argument_type;
+    typedef bool result_type;
+
     unary_counting_predicate(Predicate p) : p_(p), count_(0) {}
     ~unary_counting_predicate() {}
 
@@ -28,8 +31,11 @@
 
 
 template <typename Predicate, typename Arg1, typename Arg2=Arg1>
-struct binary_counting_predicate : public std::binary_function<Arg1, Arg2, bool> {
+struct binary_counting_predicate {
 public:
+    typedef Arg1 first_argument_type;
+    typedef Arg2 second_argument_type;
+    typedef bool result_type;
 
     binary_counting_predicate ( Predicate p ) : p_(p), count_(0) {}
     ~binary_counting_predicate() {}
Index: test/std/utilities/function.objects/refwrap/weak_result.pass.cpp
===================================================================
--- test/std/utilities/function.objects/refwrap/weak_result.pass.cpp
+++ test/std/utilities/function.objects/refwrap/weak_result.pass.cpp
@@ -16,27 +16,42 @@
 #include <functional>
 #include <type_traits>
 
+template <class Arg, class Result>
+struct my_unary_function
+{ // std::unary_function was removed in C++17
+    typedef Arg argument_type;
+    typedef Result result_type;
+};
+
+template <class Arg1, class Arg2, class Result>
+struct my_binary_function
+{ // std::binary_function was removed in C++17
+    typedef Arg1 first_argument_type;
+    typedef Arg2 second_argument_type;
+    typedef Result result_type;
+};
+
 class functor1
-    : public std::unary_function<int, char>
+    : public my_unary_function<int, char>
 {
 };
 
 class functor2
-    : public std::binary_function<char, int, double>
+    : public my_binary_function<char, int, double>
 {
 };
 
 class functor3
-    : public std::unary_function<char, int>,
-      public std::binary_function<char, int, double>
+    : public my_unary_function<char, int>,
+      public my_binary_function<char, int, double>
 {
 public:
     typedef float result_type;
 };
 
 class functor4
-    : public std::unary_function<char, int>,
-      public std::binary_function<char, int, double>
+    : public my_unary_function<char, int>,
+      public my_binary_function<char, int, double>
 {
 public:
 };
Index: test/std/utilities/function.objects/refwrap/refwrap.const/type_ctor.pass.cpp
===================================================================
--- test/std/utilities/function.objects/refwrap/refwrap.const/type_ctor.pass.cpp
+++ test/std/utilities/function.objects/refwrap/refwrap.const/type_ctor.pass.cpp
@@ -17,7 +17,6 @@
 #include <cassert>
 
 class functor1
-    : public std::unary_function<int, char>
 {
 };
 
Index: test/std/utilities/function.objects/refwrap/refwrap.const/copy_ctor.pass.cpp
===================================================================
--- test/std/utilities/function.objects/refwrap/refwrap.const/copy_ctor.pass.cpp
+++ test/std/utilities/function.objects/refwrap/refwrap.const/copy_ctor.pass.cpp
@@ -17,7 +17,6 @@
 #include <cassert>
 
 class functor1
-    : public std::unary_function<int, char>
 {
 };
 
Index: test/std/utilities/function.objects/refwrap/refwrap.assign/copy_assign.pass.cpp
===================================================================
--- test/std/utilities/function.objects/refwrap/refwrap.assign/copy_assign.pass.cpp
+++ test/std/utilities/function.objects/refwrap/refwrap.assign/copy_assign.pass.cpp
@@ -17,7 +17,6 @@
 #include <cassert>
 
 class functor1
-    : public std::unary_function<int, char>
 {
 };
 
Index: test/std/utilities/function.objects/refwrap/refwrap.access/conversion.pass.cpp
===================================================================
--- test/std/utilities/function.objects/refwrap/refwrap.access/conversion.pass.cpp
+++ test/std/utilities/function.objects/refwrap/refwrap.access/conversion.pass.cpp
@@ -17,7 +17,6 @@
 #include <cassert>
 
 class functor1
-    : public std::unary_function<int, char>
 {
 };
 
Index: test/std/utilities/function.objects/func.wrap/func.wrap.func/derive_from.pass.cpp
===================================================================
--- test/std/utilities/function.objects/func.wrap/func.wrap.func/derive_from.pass.cpp
+++ test/std/utilities/function.objects/func.wrap/func.wrap.func/derive_from.pass.cpp
@@ -8,7 +8,6 @@
 //===----------------------------------------------------------------------===//
 
 // UNSUPPORTED: c++98, c++03
-// REQUIRES: c++11 || c++14
 
 // <functional>
 
@@ -25,5 +24,7 @@
 int main() {
     S s( [](){} );
     S f1( s );
+#if TEST_STD_VER <= 14
     S f2(std::allocator_arg, std::allocator<int>{}, s);
+#endif
 }
Index: test/std/utilities/function.objects/func.require/unary_function.pass.cpp
===================================================================
--- test/std/utilities/function.objects/func.require/unary_function.pass.cpp
+++ test/std/utilities/function.objects/func.require/unary_function.pass.cpp
@@ -8,6 +8,8 @@
 //===----------------------------------------------------------------------===//
 
 // <functional>
+// REQUIRES: c++98 || c++03 || c++11 || c++14
+// unary_function was removed in C++17
 
 // unary_function
 
Index: test/std/utilities/function.objects/func.require/binary_function.pass.cpp
===================================================================
--- test/std/utilities/function.objects/func.require/binary_function.pass.cpp
+++ test/std/utilities/function.objects/func.require/binary_function.pass.cpp
@@ -8,6 +8,8 @@
 //===----------------------------------------------------------------------===//
 
 // <functional>
+// REQUIRES: c++98 || c++03 || c++11 || c++14
+// binary_function was removed in C++17
 
 // binary_function
 
Index: test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp
===================================================================
--- test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp
+++ test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp
@@ -16,6 +16,8 @@
 // XFAIL: c++98, c++03
 
 // <future>
+// REQUIRES: c++11 || c++14
+// packaged_task allocator support was removed in C++17 (LWG 2976)
 
 // class packaged_task<R(ArgTypes...)>
 
Index: test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp
===================================================================
--- test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp
+++ test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp
@@ -9,6 +9,8 @@
 //
 // UNSUPPORTED: libcpp-has-no-threads
 // UNSUPPORTED: c++98, c++03
+// REQUIRES: c++11 || c++14
+// packaged_task allocator support was removed in C++17 (LWG 2921)
 
 // <future>
 
Index: test/std/depr/depr.function.objects/depr.base/unary_function.pass.cpp
===================================================================
--- test/std/depr/depr.function.objects/depr.base/unary_function.pass.cpp
+++ test/std/depr/depr.function.objects/depr.base/unary_function.pass.cpp
@@ -8,6 +8,8 @@
 //===----------------------------------------------------------------------===//
 
 // <functional>
+// REQUIRES: c++98 || c++03 || c++11 || c++14
+// unary_function was removed in C++17
 
 // template <class Arg, class Result>
 // struct unary_function
Index: test/std/depr/depr.function.objects/depr.base/binary_function.pass.cpp
===================================================================
--- test/std/depr/depr.function.objects/depr.base/binary_function.pass.cpp
+++ test/std/depr/depr.function.objects/depr.base/binary_function.pass.cpp
@@ -8,6 +8,8 @@
 //===----------------------------------------------------------------------===//
 
 // <functional>
+// REQUIRES: c++98 || c++03 || c++11 || c++14
+// binary_function was removed in C++17
 
 // template <class Arg1, class Arg2, class Result>
 // struct binary_function
Index: test/std/containers/NotConstructible.h
===================================================================
--- test/std/containers/NotConstructible.h
+++ test/std/containers/NotConstructible.h
@@ -29,8 +29,10 @@
 
 template <>
 struct hash<NotConstructible>
-    : public std::unary_function<NotConstructible, std::size_t>
 {
+    typedef NotConstructible argument_type;
+    typedef std::size_t result_type;
+
     std::size_t operator()(const NotConstructible&) const {return 0;}
 };
 
Index: test/std/containers/Emplaceable.h
===================================================================
--- test/std/containers/Emplaceable.h
+++ test/std/containers/Emplaceable.h
@@ -45,8 +45,10 @@
 
 template <>
 struct hash<Emplaceable>
-    : public std::unary_function<Emplaceable, std::size_t>
 {
+    typedef Emplaceable argument_type;
+    typedef std::size_t result_type;
+
     std::size_t operator()(const Emplaceable& x) const {return x.get();}
 };
 
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
  • [PATCH] D36503: [libcxx... Stephan T. Lavavej via Phabricator via cfe-commits

Reply via email to