diff options
| author | Stefan Boberg <[email protected]> | 2021-08-12 23:39:29 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-08-12 23:39:29 +0200 |
| commit | 991aad332741adf794785216bd202c57697280a3 (patch) | |
| tree | 452b279820fe4e1241390c0d432d3ef4243a7c45 | |
| parent | Added placeholder chunk fetch (diff) | |
| parent | Added _WIN32_WINNT=0x0A00 definition to silence compile warning (diff) | |
| download | zen-991aad332741adf794785216bd202c57697280a3.tar.xz zen-991aad332741adf794785216bd202c57697280a3.zip | |
Merge branch 'main' of https://github.com/EpicGames/zen into main
| -rw-r--r-- | zenfs_common.props | 1 | ||||
| -rw-r--r-- | zenserver/upstream/zen.cpp | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/zenfs_common.props b/zenfs_common.props index 722f69582..4ab89e80f 100644 --- a/zenfs_common.props +++ b/zenfs_common.props @@ -11,6 +11,7 @@ <WarningLevel>Level4</WarningLevel> <MultiProcessorCompilation>true</MultiProcessorCompilation> <TreatWarningAsError>true</TreatWarningAsError> + <PreprocessorDefinitions>_UNICODE;UNICODE;_WIN32_WINNT=0x0A00 ;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemGroup /> diff --git a/zenserver/upstream/zen.cpp b/zenserver/upstream/zen.cpp index 55964643a..c6f271e14 100644 --- a/zenserver/upstream/zen.cpp +++ b/zenserver/upstream/zen.cpp @@ -9,7 +9,17 @@ #include "cache/structuredcachestore.h" +// cpr //////////////////////////////////////////////////////////////////// +// +// For some reason, these don't seem to stick, so we disable the warnings +//# define _SILENCE_CXX17_C_HEADER_DEPRECATION_WARNING 1 +//# define _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS 1 +#pragma warning(push) +#pragma warning(disable : 4004) +#pragma warning(disable : 4996) #include <cpr/cpr.h> +#pragma warning(pop) + #include <spdlog/spdlog.h> #include <xxhash.h> #include <gsl/gsl-lite.hpp> |