replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[libc++][test] Use <version> to get config on MSVC 

...instead of `<ciso646>`.

Also includes some NFC comment changes.

llvm-svn: 374854
This commit is contained in:
Casey Carter 2019-10-15 00:22:38 +00:00
parent d04855f820
commit 6f0768f64d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcxx/test/support/msvc_stdlib_force_include.h
View File

@ -77,7 +77,7 @@ const AssertionDialogAvoider assertion_dialog_avoider{};
#define _SILENCE_ALL_CXX20_DEPRECATION_WARNINGS #define _SILENCE_ALL_CXX20_DEPRECATION_WARNINGS
#endif // _LIBCXX_IN_DEVCRT #endif // _LIBCXX_IN_DEVCRT
#include <ciso646> #include <version>
#if _HAS_CXX20 #if _HAS_CXX20
#define TEST_STD_VER 99 #define TEST_STD_VER 99

2
libcxx/test/support/test_macros.h
View File

@ -140,7 +140,7 @@
#define TEST_THROW_SPEC(...) throw(__VA_ARGS__) #define TEST_THROW_SPEC(...) throw(__VA_ARGS__)
#endif #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. // 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++ // 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 #if __ISO_C_VISIBLE >= 2011 || TEST_STD_VER >= 11

8
libcxx/test/support/test_workarounds.h
View File

@ -13,19 +13,19 @@
#include "test_macros.h" #include "test_macros.h"
#if defined(TEST_COMPILER_EDG) #if defined(TEST_COMPILER_EDG)
# define TEST_WORKAROUND_EDG_EXPLICIT_CONSTEXPR // VSO#424280 # define TEST_WORKAROUND_EDG_EXPLICIT_CONSTEXPR // VSO-424280
#endif #endif
#if defined(TEST_COMPILER_C1XX) #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 # 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
#endif #endif
#if defined(TEST_COMPILER_GCC) #if defined(TEST_COMPILER_GCC)
# if __GNUC__ < 9 # if __GNUC__ < 9
# define TEST_WORKAROUND_CONSTEXPR_IMPLIES_NOEXCEPT // GCC PR 87603 # define TEST_WORKAROUND_CONSTEXPR_IMPLIES_NOEXCEPT // GCC-87603
# endif # endif
#endif #endif