Fixed msvc compilation

6 years ago · 6b5ebab6ae
parent 8107df08a8
commit 6b5ebab6ae
2 changed files with 8 additions and 5 deletions
--- a/include/spdlog/fmt/fmt.h
+++ b/include/spdlog/fmt/fmt.h
@ -10,11 +10,11 @@
 // By default spdlog include its own copy.
 //

-
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
 #pragma GCC diagnostic ignored "-Wsign-conversion"
-
+#endif

 #if !defined(SPDLOG_FMT_EXTERNAL)
 #ifdef SPDLOG_HEADER_ONLY
@ -31,4 +31,7 @@
 #include <fmt/core.h>
 #include <fmt/format.h>
 #endif
+
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic pop
+#endif
--- a/src/fmt.cpp
+++ b/src/fmt.cpp
@ -6,7 +6,7 @@
 // Copyright (c) 2012 - 2016, Victor Zverovich
 // All rights reserved.

-
+#if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
 #pragma GCC diagnostic ignored "-Wsign-conversion"
@ -15,7 +15,7 @@
 #include "spdlog/fmt/bundled/format-inl.h"

 #pragma GCC diagnostic pop
-
+#endif


 FMT_BEGIN_NAMESPACE