Merge branch 'main' of https://github.com/EpicGames/zen

3 files changed, 18 insertions, 16 deletions

diff --git a/zencore/compactbinary.cpp b/zencore/compactbinary.cpp
index aafb365f3..ec549a3e9 100644
--- a/zencore/compactbinary.cpp
+++ b/zencore/compactbinary.cpp
@@ -1854,11 +1854,11 @@ TEST_CASE("uson.json")
 			   << "ValueTwo";
 		CbObject Obj = Writer.Save();
 
-		StringBuilder<128>	   Sb;
-		const std::string_view JsonText = Obj.ToJson(Sb).ToView();
+		StringBuilder<128> Sb;
+		const char* JsonText = Obj.ToJson(Sb).Data();
 
 		std::string	 JsonError;
-		json11::Json Json = json11::Json::parse(JsonText.data(), JsonError);
+		json11::Json Json = json11::Json::parse(JsonText, JsonError);
 
 		const std::string ValueOne = Json["KeyOne"].string_value();
 		const std::string ValueTwo = Json["KeyTwo"].string_value();
@@ -1879,11 +1879,11 @@ TEST_CASE("uson.json")
 
 		CbObject Obj = Writer.Save();
 
-		StringBuilder<128>	   Sb;
-		const std::string_view JsonText = Obj.ToJson(Sb).ToView();
+		StringBuilder<128> Sb;
+		const char* JsonText = Obj.ToJson(Sb).Data();
 
 		std::string	 JsonError;
-		json11::Json Json = json11::Json::parse(JsonText.data(), JsonError);
+		json11::Json Json = json11::Json::parse(JsonText, JsonError);
 
 		const float	 FloatValue	 = float(Json["Float"].number_value());
 		const double DoubleValue = Json["Double"].number_value();
@@ -1904,11 +1904,11 @@ TEST_CASE("uson.json")
 
 		CbObject Obj = Writer.Save();
 
-		StringBuilder<128>	   Sb;
-		const std::string_view JsonText = Obj.ToJson(Sb).ToView();
+		StringBuilder<128> Sb;
+		const char* JsonText = Obj.ToJson(Sb).Data();
 
 		std::string	 JsonError;
-		json11::Json Json = json11::Json::parse(JsonText.data(), JsonError);
+		json11::Json Json = json11::Json::parse(JsonText, JsonError);
 
 		const double FloatValue	 = Json["FloatNan"].number_value();
 		const double DoubleValue = Json["DoubleNan"].number_value();
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 450468bb4..52648efcc 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -989,7 +989,7 @@ TEST_CASE("project.basic")
 			}
 		}
 
-		BaseUri << "/oplog/ps5";
+		BaseUri << "/oplog/foobar";
 
 		{
 			{
@@ -1005,7 +1005,7 @@ TEST_CASE("project.basic")
 
 				zen::CbObjectView ResponseObject = zen::CbFieldView(Response.text.data()).AsObjectView();
 
-				CHECK(ResponseObject["id"].AsString() == "ps5"sv);
+				CHECK(ResponseObject["id"].AsString() == "foobar"sv);
 				CHECK(ResponseObject["project"].AsString() == "test"sv);
 			}
 		}
@@ -1027,11 +1027,13 @@ TEST_CASE("project.basic")
 				"00010000"};
 			auto FileOid = zen::Oid::FromHexString(ChunkId);
 
+			std::filesystem::path ReliablePath = zen::GetRunningExecutablePath();
+
 			OpWriter.BeginArray("files");
 			OpWriter.BeginObject();
 			OpWriter << "id" << FileOid;
-			OpWriter << "clientpath" << __FILE__;
-			OpWriter << "serverpath" << __FILE__;
+			OpWriter << "clientpath" << ReliablePath.c_str();
+			OpWriter << "serverpath" << ReliablePath.c_str();
 			OpWriter.EndObject();
 			OpWriter.EndArray();
 
diff --git a/zenserver/upstream/upstreamcache.cpp b/zenserver/upstream/upstreamcache.cpp
index c0cd858b6..a260cb40d 100644
--- a/zenserver/upstream/upstreamcache.cpp
+++ b/zenserver/upstream/upstreamcache.cpp
@@ -178,7 +178,7 @@ namespace detail {
 			using namespace fmt::literals;
 
 			ZEN_ASSERT(CacheRecord.PayloadIds.size() == Payloads.size());
-			const size_t MaxAttempts = 3;
+			const int32_t MaxAttempts = 3;
 
 			try
 			{
@@ -223,7 +223,7 @@ namespace detail {
 							const size_t Idx = std::distance(std::begin(CacheRecord.PayloadIds), It);
 
 							CloudCacheResult BlobResult;
-							for (size_t Attempt = 0; Attempt < MaxAttempts && !BlobResult.Success; Attempt++)
+							for (int32_t Attempt = 0; Attempt < MaxAttempts && !BlobResult.Success; Attempt++)
 							{
 								BlobResult = Session.PutCompressedBlob(CacheRecord.PayloadIds[Idx], Payloads[Idx]);
 							}
@@ -479,7 +479,7 @@ namespace detail {
 													  std::span<IoBuffer const>	 Payloads) override
 		{
 			ZEN_ASSERT(CacheRecord.PayloadIds.size() == Payloads.size());
-			const uint32_t MaxAttempts = 3;
+			const int32_t MaxAttempts = 3;
 
 			try
 			{