From 54e240e98cf0e680872888cb4bfb92876f29fcdb Mon Sep 17 00:00:00 2001
From: Jan <jan@laupetin.net>
Date: Wed, 8 Jan 2025 00:05:20 +0100
Subject: [PATCH] fix: compilation

---
 src/ObjCompiling/Game/IW3/ObjCompilerIW3.cpp          | 1 -
 src/ObjCompiling/Game/IW4/ObjCompilerIW4.cpp          | 1 -
 src/ObjCompiling/Game/IW5/ObjCompilerIW5.cpp          | 1 -
 src/ObjCompiling/Game/T5/ObjCompilerT5.cpp            | 1 -
 src/ObjCompiling/Game/T6/ObjCompilerT6.cpp            | 1 -
 test/ObjCommonTestUtils/SearchPath/MockOutputPath.cpp | 4 +++-
 6 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/ObjCompiling/Game/IW3/ObjCompilerIW3.cpp b/src/ObjCompiling/Game/IW3/ObjCompilerIW3.cpp
index d1be036d..69c47261 100644
--- a/src/ObjCompiling/Game/IW3/ObjCompilerIW3.cpp
+++ b/src/ObjCompiling/Game/IW3/ObjCompilerIW3.cpp
@@ -6,7 +6,6 @@
 #include <memory>
 
 using namespace IW3;
-namespace fs = std::filesystem;
 
 namespace
 {
diff --git a/src/ObjCompiling/Game/IW4/ObjCompilerIW4.cpp b/src/ObjCompiling/Game/IW4/ObjCompilerIW4.cpp
index d1b3e766..ed6b6963 100644
--- a/src/ObjCompiling/Game/IW4/ObjCompilerIW4.cpp
+++ b/src/ObjCompiling/Game/IW4/ObjCompilerIW4.cpp
@@ -6,7 +6,6 @@
 #include <memory>
 
 using namespace IW4;
-namespace fs = std::filesystem;
 
 namespace
 {
diff --git a/src/ObjCompiling/Game/IW5/ObjCompilerIW5.cpp b/src/ObjCompiling/Game/IW5/ObjCompilerIW5.cpp
index b04f4aeb..e9faf12e 100644
--- a/src/ObjCompiling/Game/IW5/ObjCompilerIW5.cpp
+++ b/src/ObjCompiling/Game/IW5/ObjCompilerIW5.cpp
@@ -6,7 +6,6 @@
 #include <memory>
 
 using namespace IW5;
-namespace fs = std::filesystem;
 
 namespace
 {
diff --git a/src/ObjCompiling/Game/T5/ObjCompilerT5.cpp b/src/ObjCompiling/Game/T5/ObjCompilerT5.cpp
index da94980a..e08a010f 100644
--- a/src/ObjCompiling/Game/T5/ObjCompilerT5.cpp
+++ b/src/ObjCompiling/Game/T5/ObjCompilerT5.cpp
@@ -6,7 +6,6 @@
 #include <memory>
 
 using namespace T5;
-namespace fs = std::filesystem;
 
 namespace
 {
diff --git a/src/ObjCompiling/Game/T6/ObjCompilerT6.cpp b/src/ObjCompiling/Game/T6/ObjCompilerT6.cpp
index bc59cf06..5052d5ab 100644
--- a/src/ObjCompiling/Game/T6/ObjCompilerT6.cpp
+++ b/src/ObjCompiling/Game/T6/ObjCompilerT6.cpp
@@ -8,7 +8,6 @@
 #include <memory>
 
 using namespace T6;
-namespace fs = std::filesystem;
 
 namespace
 {
diff --git a/test/ObjCommonTestUtils/SearchPath/MockOutputPath.cpp b/test/ObjCommonTestUtils/SearchPath/MockOutputPath.cpp
index 4b4db64c..5b0d761a 100644
--- a/test/ObjCommonTestUtils/SearchPath/MockOutputPath.cpp
+++ b/test/ObjCommonTestUtils/SearchPath/MockOutputPath.cpp
@@ -2,6 +2,8 @@
 
 #include "Utils/ObjStream.h"
 
+#include <cstring>
+
 namespace
 {
     class MockFileBuffer final : public std::streambuf
@@ -37,7 +39,7 @@ namespace
 
             if (overrideCount > 0)
             {
-                memcpy(&m_data[m_pos], ptr, overrideCount);
+                std::memcpy(&m_data[m_pos], ptr, overrideCount);
                 m_pos += overrideCount;
                 ptr += overrideCount;
             }