diff options
| author | Martin Ridgers <[email protected]> | 2021-10-29 15:42:30 +0200 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-10-29 15:49:27 +0200 |
| commit | e785ca729bae6152eaf400ec2aad0bedc66ccd8c (patch) | |
| tree | 8589d6eacb54c1bb01405ea7b98e59f0de927c61 | |
| parent | Missing include (diff) | |
| download | zen-e785ca729bae6152eaf400ec2aad0bedc66ccd8c.tar.xz zen-e785ca729bae6152eaf400ec2aad0bedc66ccd8c.zip | |
Use THIRDPARTY_START/END instead of MSVC pragmas
| -rw-r--r-- | zencore/include/zencore/zencore.h | 5 | ||||
| -rw-r--r-- | zenserver/cache/structuredcachestore.h | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/zencore/include/zencore/zencore.h b/zencore/include/zencore/zencore.h index 46162a804..6b98749fe 100644 --- a/zencore/include/zencore/zencore.h +++ b/zencore/include/zencore/zencore.h @@ -80,8 +80,9 @@ # 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 : 4668)) /* use of undefined preprocessor macro */ \ + __pragma(warning(disable : 4267)) /* '=': conversion from 'size_t' to 'US' */ \ + __pragma(warning(disable : 4127)) # else # define ZEN_THIRD_PARTY_INCLUDES_START # endif diff --git a/zenserver/cache/structuredcachestore.h b/zenserver/cache/structuredcachestore.h index 4753af627..1f53b5c08 100644 --- a/zenserver/cache/structuredcachestore.h +++ b/zenserver/cache/structuredcachestore.h @@ -9,10 +9,9 @@ #include <zencore/uid.h> #include <zenstore/cas.h> -#pragma warning(push) -#pragma warning(disable : 4127) +ZEN_THIRD_PARTY_INCLUDES_START #include <tsl/robin_map.h> -#pragma warning(pop) +ZEN_THIRD_PARTY_INCLUDES_END #include <compare> #include <filesystem> |