Skip to content

F
folly
Commit 6884ecfc authored by Dan Melnic's avatar Dan Melnic Committed by Facebook Github Bot
Browse files
Options

Handle __clang__ warnings under Windows 

Summary: Handle __clang__ warnings under Windows

Differential Revision: D19529853

fbshipit-source-id: 936f4acaaf0f601fc09e5e7de447b9c9b4c34151
parent e95c0a25
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
folly/Portability.h
View file @ 6884ecfc
...@@ -163,16 +163,7 @@ constexpr bool kIsSanitize = false; ...@@ -163,16 +163,7 @@ constexpr bool kIsSanitize = false;
#endif #endif
// Generalize warning push/pop. // Generalize warning push/pop.
#if defined(_MSC_VER) #if defined(__GNUC__) || defined(__clang__)
#define FOLLY_PUSH_WARNING __pragma(warning(push))
#define FOLLY_POP_WARNING __pragma(warning(pop))
// Disable the GCC warnings.
#define FOLLY_GNU_DISABLE_WARNING(warningName)
#define FOLLY_GCC_DISABLE_WARNING(warningName)
#define FOLLY_CLANG_DISABLE_WARNING(warningName)
#define FOLLY_MSVC_DISABLE_WARNING(warningNumber) \
__pragma(warning(disable : warningNumber))
#elif defined(__GNUC__)
// Clang & GCC // Clang & GCC
#define FOLLY_PUSH_WARNING _Pragma("GCC diagnostic push") #define FOLLY_PUSH_WARNING _Pragma("GCC diagnostic push")
#define FOLLY_POP_WARNING _Pragma("GCC diagnostic pop") #define FOLLY_POP_WARNING _Pragma("GCC diagnostic pop")
...@@ -190,6 +181,15 @@ constexpr bool kIsSanitize = false; ...@@ -190,6 +181,15 @@ constexpr bool kIsSanitize = false;
FOLLY_GNU_DISABLE_WARNING(warningName) FOLLY_GNU_DISABLE_WARNING(warningName)
#endif #endif
#define FOLLY_MSVC_DISABLE_WARNING(warningNumber) #define FOLLY_MSVC_DISABLE_WARNING(warningNumber)
#elif defined(_MSC_VER)
#define FOLLY_PUSH_WARNING __pragma(warning(push))
#define FOLLY_POP_WARNING __pragma(warning(pop))
// Disable the GCC warnings.
#define FOLLY_GNU_DISABLE_WARNING(warningName)
#define FOLLY_GCC_DISABLE_WARNING(warningName)
#define FOLLY_CLANG_DISABLE_WARNING(warningName)
#define FOLLY_MSVC_DISABLE_WARNING(warningNumber) \
__pragma(warning(disable : warningNumber))
#else #else
#define FOLLY_PUSH_WARNING #define FOLLY_PUSH_WARNING
#define FOLLY_POP_WARNING #define FOLLY_POP_WARNING
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment