A 'long int' is larger on non-Windows causing narrowing warnings

1 files changed, 23 insertions, 15 deletions

diff --git a/zenserver/upstream/jupiter.cpp b/zenserver/upstream/jupiter.cpp
index 0670c94cd..c3480ff56 100644
--- a/zenserver/upstream/jupiter.cpp
+++ b/zenserver/upstream/jupiter.cpp
@@ -118,7 +118,7 @@ CloudCacheSession::GetDerivedData(std::string_view BucketId, std::string_view Ke
 	return {.Response		= Buffer,
 			.Bytes			= Response.downloaded_bytes,
 			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
+			.ErrorCode		= !Success ? int32_t(Response.status_code) : 0,
 			.Success		= Success};
 }
 
@@ -167,7 +167,7 @@ CloudCacheSession::GetRef(std::string_view BucketId, const IoHash& Key, ZenConte
 	return {.Response		= Buffer,
 			.Bytes			= Response.downloaded_bytes,
 			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
+			.ErrorCode		= !Success ? int32_t(Response.status_code) : 0,
 			.Success		= Success};
 }
 
@@ -208,7 +208,7 @@ CloudCacheSession::GetBlob(const IoHash& Key)
 	return {.Response		= Buffer,
 			.Bytes			= Response.downloaded_bytes,
 			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
+			.ErrorCode		= !Success ? int32_t(Response.status_code) : 0,
 			.Success		= Success};
 }
 
@@ -248,7 +248,7 @@ CloudCacheSession::GetCompressedBlob(const IoHash& Key)
 	return {.Response		= Buffer,
 			.Bytes			= Response.downloaded_bytes,
 			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
+			.ErrorCode		= !Success ? int32_t(Response.status_code) : 0,
 			.Success		= Success};
 }
 
@@ -288,7 +288,7 @@ CloudCacheSession::GetObject(const IoHash& Key)
 	return {.Response		= Buffer,
 			.Bytes			= Response.downloaded_bytes,
 			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
+			.ErrorCode		= !Success ? int32_t(Response.status_code) : 0,
 			.Success		= Success};
 }
 
@@ -330,7 +330,7 @@ CloudCacheSession::PutDerivedData(std::string_view BucketId, std::string_view Ke
 
 	return {.Bytes			= Response.uploaded_bytes,
 			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
+			.ErrorCode		= !Success ? int32_t(Response.status_code) : 0,
 			.Success		= Success};
 }
 
@@ -387,7 +387,7 @@ CloudCacheSession::PutRef(std::string_view BucketId, const IoHash& Key, IoBuffer
 
 	PutRefResult Result;
 	Result.Success		  = (Response.status_code == 200 || Response.status_code == 201);
-	Result.ErrorCode	  = !Result.Success ? Response.status_code : 0;
+	Result.ErrorCode	  = !Result.Success ? int32_t(Response.status_code) : 0;
 	Result.Bytes		  = Response.uploaded_bytes;
 	Result.ElapsedSeconds = Response.elapsed;
 
@@ -452,7 +452,7 @@ CloudCacheSession::FinalizeRef(std::string_view BucketId, const IoHash& Key, con
 
 	FinalizeRefResult Result;
 	Result.Success		  = (Response.status_code == 200 || Response.status_code == 201);
-	Result.ErrorCode	  = !Result.Success ? Response.status_code : 0;
+	Result.ErrorCode	  = !Result.Success ? int32_t(Response.status_code) : 0;
 	Result.Bytes		  = Response.uploaded_bytes;
 	Result.ElapsedSeconds = Response.elapsed;
 
@@ -507,7 +507,7 @@ CloudCacheSession::PutBlob(const IoHash& Key, IoBuffer Blob)
 
 	return {.Bytes			= Response.uploaded_bytes,
 			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
+			.ErrorCode		= !Success ? int32_t(Response.status_code) : 0,
 			.Success		= Success};
 }
 
@@ -545,7 +545,7 @@ CloudCacheSession::PutCompressedBlob(const IoHash& Key, IoBuffer Blob)
 
 	return {.Bytes			= Response.uploaded_bytes,
 			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
+			.ErrorCode		= !Success ? int32_t(Response.status_code) : 0,
 			.Success		= Success};
 }
 
@@ -583,7 +583,7 @@ CloudCacheSession::PutObject(const IoHash& Key, IoBuffer Object)
 
 	return {.Bytes			= Response.uploaded_bytes,
 			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
+			.ErrorCode		= !Success ? int32_t(Response.status_code) : 0,
 			.Success		= Success};
 }
 
@@ -620,7 +620,11 @@ CloudCacheSession::RefExists(std::string_view BucketId, const IoHash& Key)
 
 	const bool Success = Response.status_code == 200;
 
-	return {.ElapsedSeconds = Response.elapsed, .ErrorCode = !Success ? Response.status_code : 0, .Success = Success};
+	return {
+		.ElapsedSeconds = Response.elapsed,
+		.ErrorCode = !Success ? int32_t(Response.status_code) : 0,
+		.Success = Success
+	};
 }
 
 CloudCacheResult
@@ -691,7 +695,11 @@ CloudCacheSession::PostComputeTasks(std::string_view ChannelId, IoBuffer TasksDa
 
 	const bool Success = Response.status_code == 200;
 
-	return {.ElapsedSeconds = Response.elapsed, .ErrorCode = !Success ? Response.status_code : 0, .Success = Success};
+	return {
+		.ElapsedSeconds = Response.elapsed,
+		.ErrorCode = !Success ? int32_t(Response.status_code) : 0,
+		.Success = Success
+	};
 }
 
 CloudCacheResult
@@ -730,7 +738,7 @@ CloudCacheSession::GetComputeUpdates(std::string_view ChannelId, const uint32_t
 	return {.Response		= Buffer,
 			.Bytes			= Response.downloaded_bytes,
 			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
+			.ErrorCode		= !Success ? int32_t(Response.status_code) : 0,
 			.Success		= Success};
 }
 
@@ -770,7 +778,7 @@ CloudCacheSession::GetObjectTree(const IoHash& Key)
 	return {.Response		= Buffer,
 			.Bytes			= Response.downloaded_bytes,
 			.ElapsedSeconds = Response.elapsed,
-			.ErrorCode		= !Success ? Response.status_code : 0,
+			.ErrorCode		= !Success ? int32_t(Response.status_code) : 0,
 			.Success		= Success};
 }