From 8141bf23dc42630bb235c155ca7db8ae56ba7610 Mon Sep 17 00:00:00 2001
From: Tom J Nowell <contact@tomjn.com>
Date: Tue, 30 Jun 2026 10:53:26 +0100
Subject: [PATCH] Portability in archive handlers

* avoid parenthesised aggregate init and name
  the type explicitly (not supported everywhere)

* avoid narrowing conversions.
---
 rts/System/FileSystem/Archives/DirArchive.cpp      | 2 +-
 rts/System/FileSystem/Archives/SevenZipArchive.cpp | 8 ++++----
 rts/System/FileSystem/Archives/ZipArchive.cpp      | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/rts/System/FileSystem/Archives/DirArchive.cpp b/rts/System/FileSystem/Archives/DirArchive.cpp
index 829a56c4251..55242d39db0 100644
--- a/rts/System/FileSystem/Archives/DirArchive.cpp
+++ b/rts/System/FileSystem/Archives/DirArchive.cpp
@@ -42,7 +42,7 @@ CDirArchive::CDirArchive(const std::string& archiveName)
 
 		// all variables here will use forward slashes, no need for conversion
 		std::string rawFileName = dataDirsAccess.LocateFile(dirName + origName);
-		files.emplace_back(origName, std::move(rawFileName), -1, 0);
+		files.emplace_back(Files{origName, std::move(rawFileName), -1, 0});
 
 		// convert to lowercase and store
 		lcNameIndex[StringToLower(std::move(origName))] = static_cast<decltype(lcNameIndex)::value_type::second_type>(files.size() - 1);
diff --git a/rts/System/FileSystem/Archives/SevenZipArchive.cpp b/rts/System/FileSystem/Archives/SevenZipArchive.cpp
index e40ce9e798d..d5994770067 100644
--- a/rts/System/FileSystem/Archives/SevenZipArchive.cpp
+++ b/rts/System/FileSystem/Archives/SevenZipArchive.cpp
@@ -147,12 +147,12 @@ CSevenZipArchive::CSevenZipArchive(const std::string& name)
 			continue;
 		}
 
-		const auto& fd = fileEntries.emplace_back(
-			i, //fp
-			SzArEx_GetFileSize(&db, i), // size
+		const auto& fd = fileEntries.emplace_back(FileEntry{
+			static_cast<int>(i), //fp
+			static_cast<int>(SzArEx_GetFileSize(&db, i)), // size
 			db.MTime.Vals ? static_cast<uint32_t>(CTimeUtil::NTFSTimeToTime64(db.MTime.Vals[i].Low, db.MTime.Vals[i].High)) : 0, // modtime
 			std::move(fileName.value()) // origName
-		);
+		});
 
 		lcNameIndex.emplace(StringToLower(fd.origName), fileEntries.size() - 1);
 	}
diff --git a/rts/System/FileSystem/Archives/ZipArchive.cpp b/rts/System/FileSystem/Archives/ZipArchive.cpp
index 37914269c49..e7b13e3e790 100644
--- a/rts/System/FileSystem/Archives/ZipArchive.cpp
+++ b/rts/System/FileSystem/Archives/ZipArchive.cpp
@@ -58,13 +58,13 @@ CZipArchive::CZipArchive(const std::string& archiveName)
 		unz_file_pos fp{};
 		unzGetFilePos(zip, &fp);
 
-		const auto& fd = fileEntries.emplace_back(
+		const auto& fd = fileEntries.emplace_back(FileEntry{
 			std::move(fp), //fp
-			info.uncompressed_size, //size
+			static_cast<int>(info.uncompressed_size), //size
 			fName, //origName
-			info.crc, //crc
+			static_cast<uint32_t>(info.crc), //crc
 			static_cast<uint32_t>(CTimeUtil::DosTimeToTime64(info.dosDate)) //modTime
-		);
+		});
 
 		lcNameIndex.emplace(StringToLower(fd.origName), fileEntries.size() - 1);
 	}