From ac5e18320323310f816fe8df0f46ebd7effcecd9 Mon Sep 17 00:00:00 2001
From: Dmytro Ivanov <dmytro.ivanov@epicgames.com>
Date: Fri, 27 Sep 2024 14:07:17 +0200
Subject: add cmake build config to be able to use clion

---
 src/zencore/logging.cpp                                | 1 +
 src/zenserver/projectstore/httpprojectstore.cpp        | 4 ++--
 src/zenstore/cache/structuredcachestore.cpp            | 2 +-
 src/zenutil/include/zenutil/logging/fullformatter.h    | 2 ++
 src/zenutil/include/zenutil/logging/rotatingfilesink.h | 1 +
 5 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/zencore/logging.cpp b/src/zencore/logging.cpp
index 1a0a91b3d..3ea291102 100644
--- a/src/zencore/logging.cpp
+++ b/src/zencore/logging.cpp
@@ -14,6 +14,7 @@ ZEN_THIRD_PARTY_INCLUDES_START
 ZEN_THIRD_PARTY_INCLUDES_END
 
 #if ZEN_PLATFORM_WINDOWS
+#include <windows.h>
 #	pragma section(".zlog$a", read)
 #	pragma section(".zlog$f", read)
 #	pragma section(".zlog$m", read)
diff --git a/src/zenserver/projectstore/httpprojectstore.cpp b/src/zenserver/projectstore/httpprojectstore.cpp
index cffd2569f..a72aa627d 100644
--- a/src/zenserver/projectstore/httpprojectstore.cpp
+++ b/src/zenserver/projectstore/httpprojectstore.cpp
@@ -1482,14 +1482,14 @@ HttpProjectService::HandleOpLogEntriesRequest(HttpRouterRequest& Req)
 			ProjectStore::Oplog::Paging EntryPaging;
 			if (std::string_view Param = Params.GetValue("start"); !Param.empty())
 			{
-				if (auto Value = ParseInt<int32>(Param))
+				if (auto Value = ParseInt<int32_t>(Param))
 				{
 					EntryPaging.Start = *Value;
 				}
 			}
 			if (std::string_view Param = Params.GetValue("count"); !Param.empty())
 			{
-				if (auto Value = ParseInt<int32>(Param))
+				if (auto Value = ParseInt<int32_t>(Param))
 				{
 					EntryPaging.Count = *Value;
 				}
diff --git a/src/zenstore/cache/structuredcachestore.cpp b/src/zenstore/cache/structuredcachestore.cpp
index ac8b70c1c..cd40cb7fa 100644
--- a/src/zenstore/cache/structuredcachestore.cpp
+++ b/src/zenstore/cache/structuredcachestore.cpp
@@ -85,7 +85,7 @@ ValidateIoBuffer(ZenContentType ContentType, IoBuffer Buffer)
 		uint64_t RawSize = 0;
 		if (!CompressedBuffer::ValidateCompressedHeader(MemoryBuffer, /* out */ HeaderRawHash, /* out */ RawSize))
 		{
-			ZEN_SCOPED_ERROR("compressed buffer header validation failed");
+			ZEN_ERROR("compressed buffer header validation failed");
 
 			return false;
 		}
diff --git a/src/zenutil/include/zenutil/logging/fullformatter.h b/src/zenutil/include/zenutil/logging/fullformatter.h
index d4a04d3e5..3f5924e04 100644
--- a/src/zenutil/include/zenutil/logging/fullformatter.h
+++ b/src/zenutil/include/zenutil/logging/fullformatter.h
@@ -8,7 +8,9 @@
 
 ZEN_THIRD_PARTY_INCLUDES_START
 #include <spdlog/formatter.h>
+#include <spdlog/details/fmt_helper.h>
 #include <spdlog/pattern_formatter.h>
+#include <spdlog/pattern_formatter-inl.h>
 ZEN_THIRD_PARTY_INCLUDES_END
 
 namespace zen::logging {
diff --git a/src/zenutil/include/zenutil/logging/rotatingfilesink.h b/src/zenutil/include/zenutil/logging/rotatingfilesink.h
index ca4649ba8..56804cf34 100644
--- a/src/zenutil/include/zenutil/logging/rotatingfilesink.h
+++ b/src/zenutil/include/zenutil/logging/rotatingfilesink.h
@@ -7,6 +7,7 @@
 ZEN_THIRD_PARTY_INCLUDES_START
 #include <spdlog/details/log_msg.h>
 #include <spdlog/sinks/base_sink.h>
+#include <spdlog/pattern_formatter.h>
 ZEN_THIRD_PARTY_INCLUDES_END
 
 #include <filesystem>
-- 
cgit v1.2.3