diff options
| author | Martin Ridgers <[email protected]> | 2021-11-01 10:10:17 +0100 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-11-01 10:13:57 +0100 |
| commit | 5b53240a4cfa3ed9aaa22a3f825bbf5965fcb0fc (patch) | |
| tree | a925c022a52bf16b36478976842d10ff04fd74eb | |
| parent | Stubbed out getenv lua config handling (diff) | |
| download | zen-5b53240a4cfa3ed9aaa22a3f825bbf5965fcb0fc.tar.xz zen-5b53240a4cfa3ed9aaa22a3f825bbf5965fcb0fc.zip | |
Use ZEN_THIRD_PARTY macros instead of '#pragma warning'
| -rw-r--r-- | zen/zen.h | 5 | ||||
| -rw-r--r-- | zenserver/upstream/zen.h | 5 |
2 files changed, 4 insertions, 6 deletions
@@ -2,10 +2,9 @@ #pragma once -#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 <zencore/refcount.h> #include <zencore/windows.h> diff --git a/zenserver/upstream/zen.h b/zenserver/upstream/zen.h index 12e46bd8d..c0814836e 100644 --- a/zenserver/upstream/zen.h +++ b/zenserver/upstream/zen.h @@ -10,10 +10,9 @@ #include <zencore/uid.h> #include <zencore/zencore.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 <asio.hpp> |