diff options
| author | Stefan Boberg <[email protected]> | 2021-10-15 16:29:38 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-10-15 16:29:38 +0200 |
| commit | bb258b7bf62c5021d2ccde38107efcfdfc52ddd0 (patch) | |
| tree | 6d641ac4ecc04373e19a9c80776a47ba5b590eaf /zenserver/diag | |
| parent | zencore: added ZEN_THIRD_PARTY_INCLUDES_START/ZEN_THIRD_PARTY_INCLUDES_END (diff) | |
| download | zen-bb258b7bf62c5021d2ccde38107efcfdfc52ddd0.tar.xz zen-bb258b7bf62c5021d2ccde38107efcfdfc52ddd0.zip | |
zencore: Enabled MSC warning 4668 to get warnings when preprocessor macros are used without an explicit definition
Also fixed up various code to compile with this, by using ZEN_THIRD_PARTY_INCLUDES_START/ZEN_THIRD_PARTY_INCLUDES_END macros
Removed prewindows.h/postwindows.h since they are no longer to be used due to the above
Diffstat (limited to 'zenserver/diag')
| -rw-r--r-- | zenserver/diag/formatters.h | 7 | ||||
| -rw-r--r-- | zenserver/diag/logging.cpp | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/zenserver/diag/formatters.h b/zenserver/diag/formatters.h index d4eeeb31c..d55765612 100644 --- a/zenserver/diag/formatters.h +++ b/zenserver/diag/formatters.h @@ -2,13 +2,10 @@ #pragma once +ZEN_THIRD_PARTY_INCLUDES_START #include <fmt/format.h> - -#pragma warning(push) -#pragma warning(disable : 4004) -#pragma warning(disable : 4996) #include <cpr/cpr.h> -#pragma warning(pop) +ZEN_THIRD_PARTY_INCLUDES_END template<> struct fmt::formatter<cpr::Response> diff --git a/zenserver/diag/logging.cpp b/zenserver/diag/logging.cpp index 7a7773cba..6e2559f1f 100644 --- a/zenserver/diag/logging.cpp +++ b/zenserver/diag/logging.cpp @@ -4,6 +4,7 @@ #include "config.h" +ZEN_THIRD_PARTY_INCLUDES_START #include <spdlog/async.h> #include <spdlog/async_logger.h> #include <spdlog/pattern_formatter.h> @@ -13,10 +14,10 @@ #include <spdlog/sinks/msvc_sink.h> #include <spdlog/sinks/rotating_file_sink.h> #include <spdlog/sinks/stdout_color_sinks.h> -#include <spdlog/spdlog.h> +ZEN_THIRD_PARTY_INCLUDES_END + #include <zencore/string.h> #include <memory> -#include "spdlog/sinks/basic_file_sink.h" // Custom logging -- test code, this should be tweaked |