diff options
| author | Henny022p <73211432+Henny022p@users.noreply.github.com> | 2026-02-08 17:51:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-08 17:51:50 +0100 |
| commit | 73901a0a012d55ebb66a4627dcb246d19737fcb5 (patch) | |
| tree | 3f6db8283bade63879f44af3b0f08322da079b70 | |
| parent | 133d0f99bab5e800ee062bacbb8ca3d63a0fd6c1 (diff) | |
| parent | cb1f00c8df5c831dba1f9231ba01d8cef2321e72 (diff) | |
Merge pull request #700 from Henny022p/fix/libfmt-g++14
fix libfmt compiler warnings with GCC 14
| -rw-r--r-- | tools/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/src/asset_processor/assets/frameobjlists.cpp | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 5d579bc6..147417ee 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -30,7 +30,7 @@ FetchContent_Declare( FetchContent_Declare( fmt GIT_REPOSITORY https://github.com/fmtlib/fmt.git - GIT_TAG 8.0.1 + GIT_TAG 11.0.2 ) # CLI11 FetchContent_Declare( diff --git a/tools/src/asset_processor/assets/frameobjlists.cpp b/tools/src/asset_processor/assets/frameobjlists.cpp index d2ac6b22..69c8000f 100644 --- a/tools/src/asset_processor/assets/frameobjlists.cpp +++ b/tools/src/asset_processor/assets/frameobjlists.cpp @@ -36,7 +36,12 @@ void FrameObjListsAsset::convertToHumanReadable(const std::vector<char>& baserom fmt::print(file.get(), "\t.4byte {:#x}\n", pointer); } - u32 max_second_level = *std::max_element(second_level.begin(), second_level.end()); + auto max_second_level_it = std::max_element(second_level.begin(), second_level.end()); + if (max_second_level_it == second_level.end()) { + fmt::print(stderr, "no second level (unreachable)"); + exit(1); + } + u32 max_second_level = *max_second_level_it; while (reader.cursor < size) { if (static_cast<u32>(reader.cursor) > max_second_level) { |