diff options
Diffstat (limited to 'zenserver')
| -rw-r--r-- | zenserver/cache/structuredcachestore.h | 5 | ||||
| -rw-r--r-- | zenserver/projectstore.h | 7 | ||||
| -rw-r--r-- | zenserver/upstream/zen.h | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/zenserver/cache/structuredcachestore.h b/zenserver/cache/structuredcachestore.h index cf22b8be2..da3e74126 100644 --- a/zenserver/cache/structuredcachestore.h +++ b/zenserver/cache/structuredcachestore.h @@ -10,10 +10,9 @@ #include <zenstore/cas.h> #include <zenstore/gc.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> diff --git a/zenserver/projectstore.h b/zenserver/projectstore.h index c9f49217a..83d3986bb 100644 --- a/zenserver/projectstore.h +++ b/zenserver/projectstore.h @@ -2,6 +2,7 @@ #pragma once +#include <zencore/logging.h> #include <zencore/uid.h> #include <zencore/xxhash.h> #include <zenhttp/httpserver.h> @@ -9,13 +10,15 @@ #include <zenstore/caslog.h> #include <zenstore/cidstore.h> -#include <tsl/robin_map.h> -#include <zencore/logging.h> #include <filesystem> #include <map> #include <optional> #include <string> +ZEN_THIRD_PARTY_INCLUDES_START +#include <tsl/robin_map.h> +ZEN_THIRD_PARTY_INCLUDES_END + namespace zen { class CbPackage; diff --git a/zenserver/upstream/zen.h b/zenserver/upstream/zen.h index 12e46bd8d..7f55294ce 100644 --- a/zenserver/upstream/zen.h +++ b/zenserver/upstream/zen.h @@ -10,12 +10,10 @@ #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) - #include <asio.hpp> +ZEN_THIRD_PARTY_INCLUDES_END #include <chrono> |