Author: stl_msft Date: Thu Aug 24 14:24:08 2017 New Revision: 311705 URL: http://llvm.org/viewvc/llvm-project?rev=311705&view=rev Log: [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. Fixes D36503. Modified: libcxx/trunk/test/std/containers/Emplaceable.h libcxx/trunk/test/std/containers/NotConstructible.h libcxx/trunk/test/std/depr/depr.function.objects/depr.base/binary_function.pass.cpp libcxx/trunk/test/std/depr/depr.function.objects/depr.base/unary_function.pass.cpp libcxx/trunk/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp libcxx/trunk/test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp libcxx/trunk/test/std/utilities/function.objects/func.require/binary_function.pass.cpp libcxx/trunk/test/std/utilities/function.objects/func.require/unary_function.pass.cpp libcxx/trunk/test/std/utilities/function.objects/func.wrap/func.wrap.func/derive_from.pass.cpp libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.access/conversion.pass.cpp libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.assign/copy_assign.pass.cpp libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.const/copy_ctor.pass.cpp libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.const/type_ctor.pass.cpp libcxx/trunk/test/std/utilities/function.objects/refwrap/weak_result.pass.cpp libcxx/trunk/test/support/counting_predicates.hpp libcxx/trunk/test/support/msvc_stdlib_force_include.hpp Modified: libcxx/trunk/test/std/containers/Emplaceable.h URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/Emplaceable.h?rev=311705&r1=311704&r2=311705&view=diff ============================================================================== --- libcxx/trunk/test/std/containers/Emplaceable.h (original) +++ libcxx/trunk/test/std/containers/Emplaceable.h Thu Aug 24 14:24:08 2017 @@ -45,8 +45,10 @@ namespace std { 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();} }; Modified: libcxx/trunk/test/std/containers/NotConstructible.h URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/NotConstructible.h?rev=311705&r1=311704&r2=311705&view=diff ============================================================================== --- libcxx/trunk/test/std/containers/NotConstructible.h (original) +++ libcxx/trunk/test/std/containers/NotConstructible.h Thu Aug 24 14:24:08 2017 @@ -29,8 +29,10 @@ namespace std 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;} }; Modified: libcxx/trunk/test/std/depr/depr.function.objects/depr.base/binary_function.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/depr/depr.function.objects/depr.base/binary_function.pass.cpp?rev=311705&r1=311704&r2=311705&view=diff ============================================================================== --- libcxx/trunk/test/std/depr/depr.function.objects/depr.base/binary_function.pass.cpp (original) +++ libcxx/trunk/test/std/depr/depr.function.objects/depr.base/binary_function.pass.cpp Thu Aug 24 14:24:08 2017 @@ -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 Modified: libcxx/trunk/test/std/depr/depr.function.objects/depr.base/unary_function.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/depr/depr.function.objects/depr.base/unary_function.pass.cpp?rev=311705&r1=311704&r2=311705&view=diff ============================================================================== --- libcxx/trunk/test/std/depr/depr.function.objects/depr.base/unary_function.pass.cpp (original) +++ libcxx/trunk/test/std/depr/depr.function.objects/depr.base/unary_function.pass.cpp Thu Aug 24 14:24:08 2017 @@ -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 Modified: libcxx/trunk/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp?rev=311705&r1=311704&r2=311705&view=diff ============================================================================== --- libcxx/trunk/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp (original) +++ libcxx/trunk/test/std/thread/futures/futures.task/futures.task.members/ctor_func_alloc.pass.cpp Thu Aug 24 14:24:08 2017 @@ -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> Modified: libcxx/trunk/test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp?rev=311705&r1=311704&r2=311705&view=diff ============================================================================== --- libcxx/trunk/test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp (original) +++ libcxx/trunk/test/std/thread/futures/futures.task/futures.task.nonmembers/uses_allocator.pass.cpp Thu Aug 24 14:24:08 2017 @@ -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...)> Modified: libcxx/trunk/test/std/utilities/function.objects/func.require/binary_function.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/function.objects/func.require/binary_function.pass.cpp?rev=311705&r1=311704&r2=311705&view=diff ============================================================================== --- libcxx/trunk/test/std/utilities/function.objects/func.require/binary_function.pass.cpp (original) +++ libcxx/trunk/test/std/utilities/function.objects/func.require/binary_function.pass.cpp Thu Aug 24 14:24:08 2017 @@ -8,6 +8,8 @@ //===----------------------------------------------------------------------===// // <functional> +// REQUIRES: c++98 || c++03 || c++11 || c++14 +// binary_function was removed in C++17 // binary_function Modified: libcxx/trunk/test/std/utilities/function.objects/func.require/unary_function.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/function.objects/func.require/unary_function.pass.cpp?rev=311705&r1=311704&r2=311705&view=diff ============================================================================== --- libcxx/trunk/test/std/utilities/function.objects/func.require/unary_function.pass.cpp (original) +++ libcxx/trunk/test/std/utilities/function.objects/func.require/unary_function.pass.cpp Thu Aug 24 14:24:08 2017 @@ -8,6 +8,8 @@ //===----------------------------------------------------------------------===// // <functional> +// REQUIRES: c++98 || c++03 || c++11 || c++14 +// unary_function was removed in C++17 // unary_function Modified: libcxx/trunk/test/std/utilities/function.objects/func.wrap/func.wrap.func/derive_from.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/function.objects/func.wrap/func.wrap.func/derive_from.pass.cpp?rev=311705&r1=311704&r2=311705&view=diff ============================================================================== --- libcxx/trunk/test/std/utilities/function.objects/func.wrap/func.wrap.func/derive_from.pass.cpp (original) +++ libcxx/trunk/test/std/utilities/function.objects/func.wrap/func.wrap.func/derive_from.pass.cpp Thu Aug 24 14:24:08 2017 @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++98, c++03 -// REQUIRES: c++11 || c++14 // <functional> @@ -25,5 +24,7 @@ struct S : public std::function<void()> int main() { S s( [](){} ); S f1( s ); +#if TEST_STD_VER <= 14 S f2(std::allocator_arg, std::allocator<int>{}, s); +#endif } Modified: libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.access/conversion.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.access/conversion.pass.cpp?rev=311705&r1=311704&r2=311705&view=diff ============================================================================== --- libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.access/conversion.pass.cpp (original) +++ libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.access/conversion.pass.cpp Thu Aug 24 14:24:08 2017 @@ -17,7 +17,6 @@ #include <cassert> class functor1 - : public std::unary_function<int, char> { }; Modified: libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.assign/copy_assign.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.assign/copy_assign.pass.cpp?rev=311705&r1=311704&r2=311705&view=diff ============================================================================== --- libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.assign/copy_assign.pass.cpp (original) +++ libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.assign/copy_assign.pass.cpp Thu Aug 24 14:24:08 2017 @@ -17,7 +17,6 @@ #include <cassert> class functor1 - : public std::unary_function<int, char> { }; Modified: libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.const/copy_ctor.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.const/copy_ctor.pass.cpp?rev=311705&r1=311704&r2=311705&view=diff ============================================================================== --- libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.const/copy_ctor.pass.cpp (original) +++ libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.const/copy_ctor.pass.cpp Thu Aug 24 14:24:08 2017 @@ -17,7 +17,6 @@ #include <cassert> class functor1 - : public std::unary_function<int, char> { }; Modified: libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.const/type_ctor.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.const/type_ctor.pass.cpp?rev=311705&r1=311704&r2=311705&view=diff ============================================================================== --- libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.const/type_ctor.pass.cpp (original) +++ libcxx/trunk/test/std/utilities/function.objects/refwrap/refwrap.const/type_ctor.pass.cpp Thu Aug 24 14:24:08 2017 @@ -17,7 +17,6 @@ #include <cassert> class functor1 - : public std::unary_function<int, char> { }; Modified: libcxx/trunk/test/std/utilities/function.objects/refwrap/weak_result.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/function.objects/refwrap/weak_result.pass.cpp?rev=311705&r1=311704&r2=311705&view=diff ============================================================================== --- libcxx/trunk/test/std/utilities/function.objects/refwrap/weak_result.pass.cpp (original) +++ libcxx/trunk/test/std/utilities/function.objects/refwrap/weak_result.pass.cpp Thu Aug 24 14:24:08 2017 @@ -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: }; Modified: libcxx/trunk/test/support/counting_predicates.hpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/support/counting_predicates.hpp?rev=311705&r1=311704&r2=311705&view=diff ============================================================================== --- libcxx/trunk/test/support/counting_predicates.hpp (original) +++ libcxx/trunk/test/support/counting_predicates.hpp Thu Aug 24 14:24:08 2017 @@ -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 @@ private: 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() {} Modified: libcxx/trunk/test/support/msvc_stdlib_force_include.hpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/support/msvc_stdlib_force_include.hpp?rev=311705&r1=311704&r2=311705&view=diff ============================================================================== --- libcxx/trunk/test/support/msvc_stdlib_force_include.hpp (original) +++ libcxx/trunk/test/support/msvc_stdlib_force_include.hpp Thu Aug 24 14:24:08 2017 @@ -69,12 +69,6 @@ const AssertionDialogAvoider assertion_d // 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 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits