diff options
| author | Billy Robert O'Neal III <bion@microsoft.com> | 2017-05-10 20:58:30 +0000 |
|---|---|---|
| committer | Billy Robert O'Neal III <bion@microsoft.com> | 2017-05-10 20:58:30 +0000 |
| commit | ac831d35cfe7d2918ea539f969d323cc40b880e7 (patch) | |
| tree | d605c103f8480b0b36929bb2eded032f9fc20205 /libcxx/test/support | |
| parent | 5d50aa32041596e2c32c50e8cf767cac5e98ba72 (diff) | |
| download | bcm5719-llvm-ac831d35cfe7d2918ea539f969d323cc40b880e7.tar.gz bcm5719-llvm-ac831d35cfe7d2918ea539f969d323cc40b880e7.zip | |
Fix bad #endif in msvc_stdlib_force_include.hpp.
llvm-svn: 302728
Diffstat (limited to 'libcxx/test/support')
| -rw-r--r-- | libcxx/test/support/msvc_stdlib_force_include.hpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libcxx/test/support/msvc_stdlib_force_include.hpp b/libcxx/test/support/msvc_stdlib_force_include.hpp index f29b84166ed..6bcc9795219 100644 --- a/libcxx/test/support/msvc_stdlib_force_include.hpp +++ b/libcxx/test/support/msvc_stdlib_force_include.hpp @@ -70,13 +70,14 @@ const AssertionDialogAvoider assertion_dialog_avoider{}; // MSVC has quick_exit() and at_quick_exit(). #define _LIBCPP_HAS_QUICK_EXIT -// atomic_is_lock_free.pass.cpp needs this VS 2015 Update 2 fix. -#define _ENABLE_ATOMIC_ALIGNMENT_FIX +#ifndef _LIBCXX_IN_DEVCRT + // atomic_is_lock_free.pass.cpp needs this VS 2015 Update 2 fix. + #define _ENABLE_ATOMIC_ALIGNMENT_FIX -// Enable features that /std:c++latest removes by default. -#define _HAS_AUTO_PTR_ETC 1 -#define _HAS_FUNCTION_ASSIGN 1 -#define _HAS_OLD_IOSTREAMS_MEMBERS 1 + // Enable features that /std:c++latest removes by default. + #define _HAS_AUTO_PTR_ETC 1 + #define _HAS_FUNCTION_ASSIGN 1 + #define _HAS_OLD_IOSTREAMS_MEMBERS 1 // Silence warnings about raw pointers and other unchecked iterators. #define _SCL_SECURE_NO_WARNINGS |
