mirror of
https://github.com/llvm-mirror/libcxx.git
synced 2025-10-22 07:51:39 +08:00
[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:
@@ -8,6 +8,8 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// <functional>
|
||||
// REQUIRES: c++98 || c++03 || c++11 || c++14
|
||||
// binary_function was removed in C++17
|
||||
|
||||
// binary_function
|
||||
|
||||
|
@@ -8,6 +8,8 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// <functional>
|
||||
// REQUIRES: c++98 || c++03 || c++11 || c++14
|
||||
// unary_function was removed in C++17
|
||||
|
||||
// unary_function
|
||||
|
||||
|
@@ -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()> { using function::function; };
|
||||
int main() {
|
||||
S s( [](){} );
|
||||
S f1( s );
|
||||
#if TEST_STD_VER <= 14
|
||||
S f2(std::allocator_arg, std::allocator<int>{}, s);
|
||||
#endif
|
||||
}
|
||||
|
@@ -17,7 +17,6 @@
|
||||
#include <cassert>
|
||||
|
||||
class functor1
|
||||
: public std::unary_function<int, char>
|
||||
{
|
||||
};
|
||||
|
||||
|
@@ -17,7 +17,6 @@
|
||||
#include <cassert>
|
||||
|
||||
class functor1
|
||||
: public std::unary_function<int, char>
|
||||
{
|
||||
};
|
||||
|
||||
|
@@ -17,7 +17,6 @@
|
||||
#include <cassert>
|
||||
|
||||
class functor1
|
||||
: public std::unary_function<int, char>
|
||||
{
|
||||
};
|
||||
|
||||
|
@@ -17,7 +17,6 @@
|
||||
#include <cassert>
|
||||
|
||||
class functor1
|
||||
: public std::unary_function<int, char>
|
||||
{
|
||||
};
|
||||
|
||||
|
@@ -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:
|
||||
};
|
||||
|
Reference in New Issue
Block a user