diff options
| author | Casey Carter <Casey@Carter.net> | 2019-01-23 22:49:44 +0000 |
|---|---|---|
| committer | Casey Carter <Casey@Carter.net> | 2019-01-23 22:49:44 +0000 |
| commit | 1ecf6e55cd8b2ebeb506f5c5ce8080a616b4ac5b (patch) | |
| tree | fbf7b60665d7b1e7dffdbf2e90f38f12fedc5eaa /libcxx/test/support | |
| parent | 4e4ecae028270930d1c5b6587bcb75b0c81fa99f (diff) | |
| download | bcm5719-llvm-1ecf6e55cd8b2ebeb506f5c5ce8080a616b4ac5b.tar.gz bcm5719-llvm-1ecf6e55cd8b2ebeb506f5c5ce8080a616b4ac5b.zip | |
[test] Define _LIBCPP_AVAILABILITY_THROW_BAD_ANY_CAST in msvc_stdlib_force_include.hpp
...so the tests under test/std/utilities/any continue to
compile with MSVC's standard library.
While we're here, let's test >C++17 features when _HAS_CXX20.
llvm-svn: 351991
Diffstat (limited to 'libcxx/test/support')
| -rw-r--r-- | libcxx/test/support/msvc_stdlib_force_include.hpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libcxx/test/support/msvc_stdlib_force_include.hpp b/libcxx/test/support/msvc_stdlib_force_include.hpp index c3dd3aad91b..fcf64d78c7f 100644 --- a/libcxx/test/support/msvc_stdlib_force_include.hpp +++ b/libcxx/test/support/msvc_stdlib_force_include.hpp @@ -78,10 +78,14 @@ const AssertionDialogAvoider assertion_dialog_avoider{}; #include <ciso646> -#if _HAS_CXX17 +#if _HAS_CXX20 + #define TEST_STD_VER 99 +#elif _HAS_CXX17 #define TEST_STD_VER 17 -#else // _HAS_CXX17 +#else // !(_HAS_CXX20 || _HAS_CXX17) #define TEST_STD_VER 14 -#endif // _HAS_CXX17 +#endif + +#define _LIBCPP_AVAILABILITY_THROW_BAD_ANY_CAST #endif // SUPPORT_MSVC_STDLIB_FORCE_INCLUDE_HPP |
