Skip to content

S
spdlog
Commit 6b5ebab6 authored by gabime's avatar gabime
Browse files
Options

Fixed msvc compilation

parent 8107df08
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
include/spdlog/fmt/fmt.h
View file @ 6b5ebab6
......@@ -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
#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
src/fmt.cpp
View file @ 6b5ebab6
......@@ -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
......
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