diff options
| -rw-r--r-- | zencore/include/zencore/zencore.h | 5 | ||||
| -rw-r--r-- | zenserver/config.cpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/zencore/include/zencore/zencore.h b/zencore/include/zencore/zencore.h index 1092b3a89..46162a804 100644 --- a/zencore/include/zencore/zencore.h +++ b/zencore/include/zencore/zencore.h @@ -78,7 +78,10 @@ #ifndef ZEN_THIRD_PARTY_INCLUDES_START # if ZEN_COMPILER_MSC -# define ZEN_THIRD_PARTY_INCLUDES_START __pragma(warning(push)) __pragma(warning(disable : 4668)) +# define ZEN_THIRD_PARTY_INCLUDES_START \ + __pragma(warning(push)) \ + __pragma(warning(disable : 4668)) /* use of undefined preprocessor macro */ \ + __pragma(warning(disable : 4267)) /* '=': conversion from 'size_t' to 'US' */ # else # define ZEN_THIRD_PARTY_INCLUDES_START # endif diff --git a/zenserver/config.cpp b/zenserver/config.cpp index 799891289..67af37678 100644 --- a/zenserver/config.cpp +++ b/zenserver/config.cpp @@ -9,10 +9,9 @@ #include <zencore/string.h> #include <zenhttp/zenhttp.h> -#pragma warning(push) -#pragma warning(disable : 4267) // warning C4267: '=': conversion from 'size_t' to 'US', possible loss of data +ZEN_THIRD_PARTY_INCLUDES_START #include <cxxopts.hpp> -#pragma warning(pop) +ZEN_THIRD_PARTY_INCLUDES_END #include <fmt/format.h> #include <zencore/logging.h> |