diff options
4 files changed, 79 insertions, 0 deletions
diff --git a/libcxx/include/functional b/libcxx/include/functional index 4adb8c92aa3..088be05cab5 100644 --- a/libcxx/include/functional +++ b/libcxx/include/functional @@ -2635,6 +2635,8 @@ struct _LIBCPP_TYPE_VIS_ONLY hash : public __enum_hash<_Tp> #if _LIBCPP_STD_VER > 14 +#define __cpp_lib_invoke 201411 + template <class _Fn, class ..._Args> result_of_t<_Fn&&(_Args&&...)> invoke(_Fn&& __f, _Args&&... __args) diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits index 43687a7c684..0f158fdb89d 100644 --- a/libcxx/include/type_traits +++ b/libcxx/include/type_traits @@ -4599,6 +4599,8 @@ struct __has_operator_addressof #endif // _LIBCPP_CXX03_LANG #if _LIBCPP_STD_VER > 14 + +#define __cpp_lib_void_t 201411 template <class...> using void_t = void; # ifndef _LIBCPP_HAS_NO_VARIADICS diff --git a/libcxx/test/std/utilities/function.objects/func.invoke/invoke_feature_test_macro.pass.cpp b/libcxx/test/std/utilities/function.objects/func.invoke/invoke_feature_test_macro.pass.cpp new file mode 100644 index 00000000000..aaac98474fc --- /dev/null +++ b/libcxx/test/std/utilities/function.objects/func.invoke/invoke_feature_test_macro.pass.cpp @@ -0,0 +1,39 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// <functional> + +// template <class F, class ...Args> +// result_of_t<F&&(Args&&...)> invoke(F&&, Args&&...); + +#include <functional> +#include <cassert> + +#include "test_macros.h" + +#if TEST_STD_VER <= 14 +# ifdef __cpp_lib_invoke +# error Feature test macro should be defined +# endif +#else +# ifndef __cpp_lib_invoke +# error Feature test macro not defined +# endif +# if __cpp_lib_invoke != 201411 +# error __cpp_lib_invoke has the wrong value +# endif +#endif + +int foo(int) { return 42; } + +int main() { +#if defined(__cpp_lib_invoke) + assert(std::invoke(foo, 101) == 42); +#endif +}
\ No newline at end of file diff --git a/libcxx/test/std/utilities/meta/meta.unary.prop.query/void_t_feature_test_macro.pass.cpp b/libcxx/test/std/utilities/meta/meta.unary.prop.query/void_t_feature_test_macro.pass.cpp new file mode 100644 index 00000000000..f188c098c03 --- /dev/null +++ b/libcxx/test/std/utilities/meta/meta.unary.prop.query/void_t_feature_test_macro.pass.cpp @@ -0,0 +1,36 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// type_traits + +// void_t + +#include <type_traits> + +#include "test_macros.h" + +#if TEST_STD_VER <= 14 +# ifdef __cpp_lib_void_t +# error Feature test macro should not be defined! +# endif +#else +# ifndef __cpp_lib_void_t +# error Feature test macro is not defined +# endif +# if __cpp_lib_void_t != 201411 +# error Feature test macro has the wrong value +# endif +#endif + +int main() +{ +#if defined(__cpp_lib_void_t) + static_assert(std::is_same_v<std::void_t<int>, void>, ""); +#endif +} |