unity build fixes (#802)

Various fixes to make cpp files build in unity build mode

as an aside using Unity build doesn't really seem to work on Linux, unsure why but it leads to link-time issues

2 files changed, 7 insertions, 7 deletions

diff --git a/src/zenremotestore/chunking/chunkblock.cpp b/src/zenremotestore/chunking/chunkblock.cpp
index 9c3fe8a0b..f80bfc2ba 100644
--- a/src/zenremotestore/chunking/chunkblock.cpp
+++ b/src/zenremotestore/chunking/chunkblock.cpp
@@ -1037,7 +1037,7 @@ ChunkBlockAnalyser::CalculateBlockRanges(uint32_t					  BlockIndex,
 
 #if ZEN_WITH_TESTS
 
-namespace testutils {
+namespace chunkblock_testutils {
 	static std::vector<std::pair<Oid, CompressedBuffer>> CreateAttachments(
 		const std::span<const size_t>& Sizes,
 		OodleCompressionLevel		   CompressionLevel = OodleCompressionLevel::VeryFast,
@@ -1054,14 +1054,14 @@ namespace testutils {
 		return Result;
 	}
 
-}  // namespace testutils
+}  // namespace chunkblock_testutils
 
 TEST_SUITE_BEGIN("remotestore.chunkblock");
 
 TEST_CASE("chunkblock.block")
 {
 	using namespace std::literals;
-	using namespace testutils;
+	using namespace chunkblock_testutils;
 
 	std::vector<std::size_t> AttachmentSizes({7633, 6825, 5738, 8031, 7225, 566,  3656, 6006, 24,	3466, 1093, 4269, 2257, 3685, 3489,
 											  7194, 6151, 5482, 6217, 3511, 6738, 5061, 7537, 2759, 1916, 8210, 2235, 4024, 1582, 5251,
@@ -1089,7 +1089,7 @@ TEST_CASE("chunkblock.block")
 TEST_CASE("chunkblock.reuseblocks")
 {
 	using namespace std::literals;
-	using namespace testutils;
+	using namespace chunkblock_testutils;
 
 	std::vector<std::vector<std::size_t>> BlockAttachmentSizes(
 		{std::vector<std::size_t>{7633, 6825, 5738, 8031, 7225, 566,  3656, 6006, 24,	3466, 1093, 4269, 2257, 3685, 3489,
diff --git a/src/zenremotestore/projectstore/remoteprojectstore.cpp b/src/zenremotestore/projectstore/remoteprojectstore.cpp
index 1882f599a..570025b6d 100644
--- a/src/zenremotestore/projectstore/remoteprojectstore.cpp
+++ b/src/zenremotestore/projectstore/remoteprojectstore.cpp
@@ -4186,7 +4186,7 @@ RemoteProjectStore::~RemoteProjectStore()
 
 #if ZEN_WITH_TESTS
 
-namespace testutils {
+namespace projectstore_testutils {
 	using namespace std::literals;
 
 	static std::string OidAsString(const Oid& Id)
@@ -4238,7 +4238,7 @@ namespace testutils {
 		return Result;
 	}
 
-}  // namespace testutils
+}  // namespace projectstore_testutils
 
 struct ExportForceDisableBlocksTrue_ForceTempBlocksFalse
 {
@@ -4265,7 +4265,7 @@ TEST_CASE_TEMPLATE("project.store.export",
 				   ExportForceDisableBlocksFalse_ForceTempBlocksTrue)
 {
 	using namespace std::literals;
-	using namespace testutils;
+	using namespace projectstore_testutils;
 
 	ScopedTemporaryDirectory TempDir;
 	ScopedTemporaryDirectory ExportDir;