[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. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@311705 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -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() {}
|
||||
|
||||
Reference in New Issue
Block a user