aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--zen/zen.h5
-rw-r--r--zenserver/upstream/zen.h5
2 files changed, 4 insertions, 6 deletions
diff --git a/zen/zen.h b/zen/zen.h
index 1c8d102d3..0042ab6aa 100644
--- a/zen/zen.h
+++ b/zen/zen.h
@@ -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>