diff options
| author | Stefan Boberg <[email protected]> | 2023-05-15 19:09:35 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2023-05-15 19:09:35 +0200 |
| commit | 11f79e65d215f53e9d29e7c4e1356fdfc7d901fd (patch) | |
| tree | 9f70333a0c278556ca2d290e9583224dcfa34aa2 | |
| parent | Added Windows runner setup doc (diff) | |
| download | zen-11f79e65d215f53e9d29e7c4e1356fdfc7d901fd.tar.xz zen-11f79e65d215f53e9d29e7c4e1356fdfc7d901fd.zip | |
disable warning C5105 in ZEN_THIRD_PARTY_INCLUDES_START
| -rw-r--r-- | src/zen/zen.cpp | 2 | ||||
| -rw-r--r-- | src/zencore/include/zencore/zencore.h | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/zen/zen.cpp b/src/zen/zen.cpp index 4f798b863..d32b630fe 100644 --- a/src/zen/zen.cpp +++ b/src/zen/zen.cpp @@ -387,7 +387,7 @@ main(int argc, char** argv) if (StrCaseCompare(SubCommand.c_str(), CmdInfo.CmdName) == 0) { cxxopts::Options& VerbOptions = CmdInfo.Cmd->Options(); - + try { return CmdInfo.Cmd->Run(GlobalOptions, (int)CommandArgVec.size(), CommandArgVec.data()); diff --git a/src/zencore/include/zencore/zencore.h b/src/zencore/include/zencore/zencore.h index d4173e128..02e9dd5d6 100644 --- a/src/zencore/include/zencore/zencore.h +++ b/src/zencore/include/zencore/zencore.h @@ -72,12 +72,13 @@ #ifndef ZEN_THIRD_PARTY_INCLUDES_START # if ZEN_COMPILER_MSC -# define ZEN_THIRD_PARTY_INCLUDES_START \ - __pragma(warning(push)) __pragma(warning(disable : 4668)) /* C4668: use of undefined preprocessor macro */ \ - __pragma(warning(disable : 4305)) /* C4305: 'if': truncation from 'uint32' to 'bool' */ \ - __pragma(warning(disable : 4267)) /* C4267: '=': conversion from 'size_t' to 'US' */ \ - __pragma(warning(disable : 4127)) /* C4127: conditional expression is constant */ \ - __pragma(warning(disable : 4189)) /* C4189: local variable is initialized but not referenced */ +# define ZEN_THIRD_PARTY_INCLUDES_START \ + __pragma(warning(push)) __pragma(warning(disable : 4668)) /* C4668: use of undefined preprocessor macro */ \ + __pragma(warning(disable : 4305)) /* C4305: 'if': truncation from 'uint32' to 'bool' */ \ + __pragma(warning(disable : 4267)) /* C4267: '=': conversion from 'size_t' to 'US' */ \ + __pragma(warning(disable : 4127)) /* C4127: conditional expression is constant */ \ + __pragma(warning(disable : 4189)) /* C4189: local variable is initialized but not referenced */ \ + __pragma(warning(disable : 5105)) /* C5105: macro expansion producing 'defined' has undefined behavior */ # elif ZEN_COMPILER_CLANG # define ZEN_THIRD_PARTY_INCLUDES_START \ _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wundef\"") \ |