[libcxx-commits] [libcxx] ea3152b - [libc++][test] Partially revert msvc_stdlib_force_include.h _Pragma change

Casey Carter via libcxx-commits libcxx-commits at lists.llvm.org
Thu Apr 2 13:03:36 PDT 2020


Author: Casey Carter
Date: 2020-04-02T12:59:57-07:00
New Revision: ea3152bb3d359f61fd3c091a640d6f0c0b2a80cc

URL: https://github.com/llvm/llvm-project/commit/ea3152bb3d359f61fd3c091a640d6f0c0b2a80cc
DIFF: https://github.com/llvm/llvm-project/commit/ea3152bb3d359f61fd3c091a640d6f0c0b2a80cc.diff

LOG: [libc++][test] Partially revert msvc_stdlib_force_include.h _Pragma change

... keep the warning suppression, but revert the `__pragma` to `_Pragma` change because `_Pragma` interacts badly with `/Zc:preprocessor`.

Added: 
    

Modified: 
    libcxx/test/support/msvc_stdlib_force_include.h

Removed: 
    


################################################################################
diff  --git a/libcxx/test/support/msvc_stdlib_force_include.h b/libcxx/test/support/msvc_stdlib_force_include.h
index 77d72223b356..cf8696af5588 100644
--- a/libcxx/test/support/msvc_stdlib_force_include.h
+++ b/libcxx/test/support/msvc_stdlib_force_include.h
@@ -100,11 +100,11 @@ const AssertionDialogAvoider assertion_dialog_avoider{};
     _Pragma("GCC diagnostic pop")
 #else // ^^^ clang / MSVC vvv
 #define _LIBCPP_SUPPRESS_DEPRECATED_PUSH \
-    _Pragma("warning(push)") \
-    _Pragma("warning(disable : 4996)") \
-    _Pragma("warning(disable : 5215)")
+    __pragma(warning(push)) \
+    __pragma(warning(disable : 4996)) \
+    __pragma(warning(disable : 5215))
 #define _LIBCPP_SUPPRESS_DEPRECATED_POP \
-    _Pragma("warning(pop)")
+    __pragma(warning(pop))
 #endif // __clang__
 
 #endif // SUPPORT_MSVC_STDLIB_FORCE_INCLUDE_H


        


More information about the libcxx-commits mailing list