mirror of
https://github.com/Laupetin/OpenAssetTools.git
synced 2025-04-20 00:02:55 +00:00
Fix build with g++13
This commit is contained in:
parent
98528db8aa
commit
dd56a57a3e
@ -1,5 +1,6 @@
|
|||||||
#include "StateMapLayout.h"
|
#include "StateMapLayout.h"
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
||||||
using namespace state_map;
|
using namespace state_map;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
#include <cstddef>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
#include <cstddef>
|
||||||
|
#include <cstdint>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
#include <cstdint>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
@ -50,6 +50,10 @@ public:
|
|||||||
|
|
||||||
if (!m_args.m_build_log_file.empty())
|
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);
|
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())
|
if (!m_build_log_file.is_open())
|
||||||
{
|
{
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
#include <cstdint>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
class XBlock
|
class XBlock
|
||||||
|
@ -5,9 +5,9 @@
|
|||||||
AbstractSalsa20Processor::AbstractSalsa20Processor(const int streamCount, std::string& zoneName, const uint8_t* salsa20Key, size_t keySize)
|
AbstractSalsa20Processor::AbstractSalsa20Processor(const int streamCount, std::string& zoneName, const uint8_t* salsa20Key, size_t keySize)
|
||||||
: m_stream_count(streamCount),
|
: m_stream_count(streamCount),
|
||||||
m_stream_contexts(std::make_unique<StreamContext[]>(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_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);
|
InitStreams(zoneName, salsa20Key, keySize);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
#include <cstdint>
|
||||||
#include "LoadingException.h"
|
#include "LoadingException.h"
|
||||||
|
|
||||||
class InvalidXBlockSizeException final : public LoadingException
|
class InvalidXBlockSizeException final : public LoadingException
|
||||||
|
Loading…
x
Reference in New Issue
Block a user