Mirror/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2025-09-30 10:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v1.x' into conf-env2

Browse Source
This commit is contained in:
gabime
2019-12-13 00:09:36 +02:00
parent 8d9d9899b7 ebaa16f403
commit 4fa463dff6
8 changed files with 48 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/fmt.cpp
View File

@@ -6,20 +6,9 @@
// 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"
#endif
#if !defined(SPDLOG_FMT_EXTERNAL)
#include "spdlog/fmt/bundled/format-inl.h"
// pop warnings supressions
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif
FMT_BEGIN_NAMESPACE
template struct FMT_API internal::basic_data<void>;