aboutsummaryrefslogtreecommitdiff
path: root/zenserver/upstream/zen.cpp
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-08-12 15:25:52 +0200
committerStefan Boberg <[email protected]>2021-08-12 15:25:52 +0200
commitb04df9407066c8c92320b51965f11f5d5500edea (patch)
treefda1917f14b82d57a9be046697eefa351ac5f113 /zenserver/upstream/zen.cpp
parenttrivial: Comment update stating intent (diff)
downloadzen-b04df9407066c8c92320b51965f11f5d5500edea.tar.xz
zen-b04df9407066c8c92320b51965f11f5d5500edea.zip
Bracket cpr with warning disable macros to fix compile issue
Diffstat (limited to 'zenserver/upstream/zen.cpp')
-rw-r--r--zenserver/upstream/zen.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/zenserver/upstream/zen.cpp b/zenserver/upstream/zen.cpp
index 715df6f69..7f485dd3f 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>