Author: bion
Date: Wed May 10 15:58:30 2017
New Revision: 302728
URL: http://llvm.org/viewvc/llvm-project?rev=302728&view=rev
Log:
Fix bad #endif in msvc_stdlib_force_include.hpp.
Modified:
libcxx/trunk/test/support/msvc_stdlib_force_include.hpp
Modified: libcxx/trunk/test/support/msvc_stdlib_force_include.hpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/support/msvc_stdlib_force_include.hpp?rev=302728&r1=302727&r2=302728&view=diff
==============================================================================
--- libcxx/trunk/test/support/msvc_stdlib_force_include.hpp (original)
+++ libcxx/trunk/test/support/msvc_stdlib_force_include.hpp Wed May 10 15:58:30
2017
@@ -70,13 +70,14 @@ const AssertionDialogAvoider assertion_d
// 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
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
