From 5f3d5935a377ad4d4be4ab1ef93e8e9294814a53 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 10 May 2017 20:58:30 +0000 Subject: [PATCH] Fix bad #endif in msvc_stdlib_force_include.hpp. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@302728 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/support/msvc_stdlib_force_include.hpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/test/support/msvc_stdlib_force_include.hpp b/test/support/msvc_stdlib_force_include.hpp index f29b84166..6bcc97952 100644 --- a/test/support/msvc_stdlib_force_include.hpp +++ b/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