From 9733860ecd9b451a0463690d12bf899e2affcdeb Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Mon, 17 Aug 2026 02:32:42 +0200 Subject: [PATCH] Fix compilation --- .../Include/System/Log/Log_generated.hpp | 23 ++++++++----------- .../Include/Utils/Containers/SlotMap.hpp | 2 +- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Bigfoot/Sources/System/Include/System/Log/Log_generated.hpp b/Bigfoot/Sources/System/Include/System/Log/Log_generated.hpp index 016228b..887afbe 100644 --- a/Bigfoot/Sources/System/Include/System/Log/Log_generated.hpp +++ b/Bigfoot/Sources/System/Include/System/Log/Log_generated.hpp @@ -12,9 +12,17 @@ static_assert(FLATBUFFERS_VERSION_MAJOR == 25 && FLATBUFFERS_VERSION_MINOR == 12 && FLATBUFFERS_VERSION_REVISION == 19, "Non-compatible flatbuffers version included"); +// Ensure the included flatbuffers.h is Bigfoot's fork - stock +// flatbuffers (or a differently versioned Bigfoot fork) is not compatible. +#ifndef FLATBUFFERS_BIGFOOT_VERSION +#error "This file requires Bigfoot's flatbuffers fork - stock flatbuffers is not compatible" +#endif +static_assert(FLATBUFFERS_BIGFOOT_VERSION == 1, + "Non-compatible Bigfoot flatbuffers fork version included"); #include "EASTL/unique_ptr.h" #include "EASTL/string.h" +#include "EASTL/vector.h" namespace Bigfoot { namespace Flat { @@ -95,11 +103,8 @@ inline const ::flatbuffers::TypeTable *LogSinkTypeTypeTable() { static const ::flatbuffers::TypeFunction type_refs[] = { Bigfoot::Flat::LogSinkTypeTypeTable }; - static const char * const names[] = { - "Console" - }; static const ::flatbuffers::TypeTable tt = { - ::flatbuffers::ST_ENUM, 1, type_codes, type_refs, nullptr, nullptr, names + ::flatbuffers::ST_ENUM, 1, type_codes, type_refs, nullptr, nullptr, nullptr }; return &tt; } @@ -116,16 +121,8 @@ inline const ::flatbuffers::TypeTable *LogLevelTypeTable() { static const ::flatbuffers::TypeFunction type_refs[] = { Bigfoot::Flat::LogLevelTypeTable }; - static const char * const names[] = { - "Debug", - "Trace", - "Info", - "Warn", - "Error", - "Critical" - }; static const ::flatbuffers::TypeTable tt = { - ::flatbuffers::ST_ENUM, 6, type_codes, type_refs, nullptr, nullptr, names + ::flatbuffers::ST_ENUM, 6, type_codes, type_refs, nullptr, nullptr, nullptr }; return &tt; } diff --git a/Bigfoot/Sources/Utils/Include/Utils/Containers/SlotMap.hpp b/Bigfoot/Sources/Utils/Include/Utils/Containers/SlotMap.hpp index fc14fc7..64b124d 100644 --- a/Bigfoot/Sources/Utils/Include/Utils/Containers/SlotMap.hpp +++ b/Bigfoot/Sources/Utils/Include/Utils/Containers/SlotMap.hpp @@ -302,7 +302,7 @@ class DenseSlotMap void RecycleKey(const SlotMapKey p_key) { - const SlotMapKey::VersionType nextVersion = static_cast(p_key.GetVersion() + 1); + const typename SlotMapKey::VersionType nextVersion = static_cast(p_key.GetVersion() + 1); if (nextVersion == SlotMapKey::INVALID_VERSION) {