From 6b5ebab6aebd08a9762e4bc944ca3a9a9bce803f Mon Sep 17 00:00:00 2001 From: gabime Date: Thu, 5 Dec 2019 02:01:02 +0200 Subject: [PATCH] Fixed msvc compilation --- include/spdlog/fmt/fmt.h | 9 ++++++--- src/fmt.cpp | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/include/spdlog/fmt/fmt.h b/include/spdlog/fmt/fmt.h index 8c7f1236..f4be282c 100644 --- 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 #include #endif -#pragma GCC diagnostic pop \ No newline at end of file + +#if defined(__GNUC__) || defined(__clang__) +#pragma GCC diagnostic pop +#endif \ No newline at end of file diff --git a/src/fmt.cpp b/src/fmt.cpp index bcc8e90d..785143c1 100644 --- 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