diff options
| author | Casey Carter <Casey@Carter.net> | 2019-10-15 00:22:38 +0000 |
|---|---|---|
| committer | Casey Carter <Casey@Carter.net> | 2019-10-15 00:22:38 +0000 |
| commit | 6f0768f64da398d5103d39e83bdc66a5ffd6f0f6 (patch) | |
| tree | 3d21ca5f3fe91ab1bc733ad6d5b235171ae016b2 | |
| parent | d04855f820c5f21c2ae95e711bf003af575e58e3 (diff) | |
| download | bcm5719-llvm-6f0768f64da398d5103d39e83bdc66a5ffd6f0f6.tar.gz bcm5719-llvm-6f0768f64da398d5103d39e83bdc66a5ffd6f0f6.zip | |
[libc++][test] Use <version> to get config on MSVC
...instead of `<ciso646>`.
Also includes some NFC comment changes.
llvm-svn: 374854
| -rw-r--r-- | libcxx/test/support/msvc_stdlib_force_include.h | 2 | ||||
| -rw-r--r-- | libcxx/test/support/test_macros.h | 2 | ||||
| -rw-r--r-- | libcxx/test/support/test_workarounds.h | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libcxx/test/support/msvc_stdlib_force_include.h b/libcxx/test/support/msvc_stdlib_force_include.h index 83920d5f809..2ec74e85a2a 100644 --- a/libcxx/test/support/msvc_stdlib_force_include.h +++ b/libcxx/test/support/msvc_stdlib_force_include.h @@ -77,7 +77,7 @@ const AssertionDialogAvoider assertion_dialog_avoider{}; #define _SILENCE_ALL_CXX20_DEPRECATION_WARNINGS #endif // _LIBCXX_IN_DEVCRT -#include <ciso646> +#include <version> #if _HAS_CXX20 #define TEST_STD_VER 99 diff --git a/libcxx/test/support/test_macros.h b/libcxx/test/support/test_macros.h index 808f2b5ff93..74253a2016a 100644 --- a/libcxx/test/support/test_macros.h +++ b/libcxx/test/support/test_macros.h @@ -140,7 +140,7 @@ #define TEST_THROW_SPEC(...) throw(__VA_ARGS__) #endif -// Sniff out to see if the underling C library has C11 features +// Sniff out to see if the underlying C library has C11 features // Note that at this time (July 2018), MacOS X and iOS do NOT. // This is cribbed from __config; but lives here as well because we can't assume libc++ #if __ISO_C_VISIBLE >= 2011 || TEST_STD_VER >= 11 diff --git a/libcxx/test/support/test_workarounds.h b/libcxx/test/support/test_workarounds.h index 81350c789d4..8c28d001aad 100644 --- a/libcxx/test/support/test_workarounds.h +++ b/libcxx/test/support/test_workarounds.h @@ -13,19 +13,19 @@ #include "test_macros.h" #if defined(TEST_COMPILER_EDG) -# define TEST_WORKAROUND_EDG_EXPLICIT_CONSTEXPR // VSO#424280 +# define TEST_WORKAROUND_EDG_EXPLICIT_CONSTEXPR // VSO-424280 #endif #if defined(TEST_COMPILER_C1XX) -# define TEST_WORKAROUND_C1XX_BROKEN_IS_TRIVIALLY_COPYABLE // VSO#117743 +# define TEST_WORKAROUND_C1XX_BROKEN_IS_TRIVIALLY_COPYABLE // VSO-117743 # ifndef _MSC_EXTENSIONS -# define TEST_WORKAROUND_C1XX_BROKEN_ZA_CTOR_CHECK // VSO#119998 +# define TEST_WORKAROUND_C1XX_BROKEN_ZA_CTOR_CHECK // VSO-119998 # endif #endif #if defined(TEST_COMPILER_GCC) # if __GNUC__ < 9 -# define TEST_WORKAROUND_CONSTEXPR_IMPLIES_NOEXCEPT // GCC PR 87603 +# define TEST_WORKAROUND_CONSTEXPR_IMPLIES_NOEXCEPT // GCC-87603 # endif #endif |
