Merge pull request #15 from Laupetin/fix/g++13-build

Fix build with g++13
Laupetin · Oct 1, 2023 · cb4f23c · cb4f23c
2 parents 98528db + dd56a57
commit cb4f23c
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 4 deletions.
diff --git a/src/Common/StateMap/StateMapLayout.cpp b/src/Common/StateMap/StateMapLayout.cpp
@@ -1,5 +1,6 @@
 #include "StateMapLayout.h"
 
+#include <algorithm>
 #include <cassert>
 
 using namespace state_map;

diff --git a/src/Common/StateMap/StateMapLayout.h b/src/Common/StateMap/StateMapLayout.h
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <cstddef>
 #include <string>
 #include <vector>
 

diff --git a/src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.h b/src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.h
@@ -1,5 +1,6 @@
 #pragma once
-
+#include <cstddef>
+#include <cstdint>
 #include <string>
 #include <vector>
 

diff --git a/src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.h b/src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.h
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <cstdint>
 #include <string>
 #include <vector>
 

diff --git a/src/RawTemplater/RawTemplater.cpp b/src/RawTemplater/RawTemplater.cpp
@@ -50,6 +50,10 @@ class RawTemplater::Impl
 
         if (!m_args.m_build_log_file.empty())
         {
+            fs::path p = fs::path(m_args.m_build_log_file).parent_path();
+            if (!p.empty())
+                fs::create_directories(p);
+
             m_build_log_file = std::ofstream(m_args.m_build_log_file, std::ios::out | std::ios::binary);
             if (!m_build_log_file.is_open())
             {

diff --git a/src/ZoneCommon/Zone/XBlock.h b/src/ZoneCommon/Zone/XBlock.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <cstdint>
 #include <string>
 
 class XBlock

diff --git a/src/ZoneCommon/Zone/XChunk/AbstractSalsa20Processor.cpp b/src/ZoneCommon/Zone/XChunk/AbstractSalsa20Processor.cpp
@@ -5,9 +5,9 @@
 AbstractSalsa20Processor::AbstractSalsa20Processor(const int streamCount, std::string& zoneName, const uint8_t* salsa20Key, size_t keySize)
     : m_stream_count(streamCount),
       m_stream_contexts(std::make_unique<StreamContext[]>(streamCount)),
-      m_block_hashes(std::make_unique<uint8_t[]>(BLOCK_HASHES_COUNT * streamCount * SHA1_HASH_SIZE)),
       m_stream_block_indices(std::make_unique<unsigned int[]>(streamCount))
 {
+    m_block_hashes = std::make_unique<uint8_t[]>(BLOCK_HASHES_COUNT * streamCount * SHA1_HASH_SIZE);
     InitStreams(zoneName, salsa20Key, keySize);
 }
 

diff --git a/src/ZoneLoading/Loading/Exception/InvalidXBlockSizeException.h b/src/ZoneLoading/Loading/Exception/InvalidXBlockSizeException.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <cstdint>
 #include "LoadingException.h"
 
 class InvalidXBlockSizeException final : public LoadingException