aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Kirchoff <[email protected]>2022-03-17 16:30:56 -0700
committerJoe Kirchoff <[email protected]>2022-03-17 16:30:56 -0700
commit871a39086693f9d42bd179dc4b6548f8e288f5f3 (patch)
tree5fee5b80c49786a11e9d440f335cf7fd6032acb3
parentFix so ZenServer compiles when ZEN_WITH_COMPUTE_SERVICES is disabled (diff)
downloadzen-871a39086693f9d42bd179dc4b6548f8e288f5f3.tar.xz
zen-871a39086693f9d42bd179dc4b6548f8e288f5f3.zip
Suppress C4305 in third party includes
-rw-r--r--zencore/include/zencore/zencore.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/zencore/include/zencore/zencore.h b/zencore/include/zencore/zencore.h
index bd5e5a531..60ebd0f5f 100644
--- a/zencore/include/zencore/zencore.h
+++ b/zencore/include/zencore/zencore.h
@@ -72,10 +72,11 @@
#ifndef ZEN_THIRD_PARTY_INCLUDES_START
# if ZEN_COMPILER_MSC
-# 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' */ \
- __pragma(warning(disable : 4127))
+# define ZEN_THIRD_PARTY_INCLUDES_START \
+ __pragma(warning(push)) __pragma(warning(disable : 4668)) /* use of undefined preprocessor macro */ \
+ __pragma(warning(disable : 4305)) /* 'if': truncation from 'uint32' to 'bool' */ \
+ __pragma(warning(disable : 4267)) /* '=': conversion from 'size_t' to 'US' */ \
+ __pragma(warning(disable : 4127)) /* conditional expression is constant */
# elif ZEN_COMPILER_CLANG
# define ZEN_THIRD_PARTY_INCLUDES_START \
_Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wundef\"") \