diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp index 3ca90d9499..e05c97ab1e 100644 --- a/src/ai/ai_info.cpp +++ b/src/ai/ai_info.cpp @@ -24,7 +24,7 @@ */ static bool CheckAPIVersion(const std::string &api_version) { - return std::ranges::find(AIInfo::ApiVersions, api_version) != AIInfo::ApiVersions.end(); + return std::ranges::find(AIInfo::ApiVersions, api_version) != std::end(AIInfo::ApiVersions); } #if defined(_WIN32) diff --git a/src/ai/ai_info.hpp b/src/ai/ai_info.hpp index baf1b9f56b..dc2e0de500 100644 --- a/src/ai/ai_info.hpp +++ b/src/ai/ai_info.hpp @@ -16,7 +16,7 @@ class AIInfo : public ScriptInfo { public: /* All valid AI API versions, in order. */ - static constexpr std::initializer_list ApiVersions{ "0.7", "1.0", "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10", "1.11", "12", "13", "14", "15" }; + static constexpr std::string_view ApiVersions[]{ "0.7", "1.0", "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10", "1.11", "12", "13", "14", "15" }; AIInfo(); diff --git a/src/game/game_info.cpp b/src/game/game_info.cpp index ad2dc9c109..03756e6e8f 100644 --- a/src/game/game_info.cpp +++ b/src/game/game_info.cpp @@ -22,7 +22,7 @@ */ static bool CheckAPIVersion(const std::string &api_version) { - return std::ranges::find(GameInfo::ApiVersions, api_version) != GameInfo::ApiVersions.end(); + return std::ranges::find(GameInfo::ApiVersions, api_version) != std::end(GameInfo::ApiVersions); } #if defined(_WIN32) diff --git a/src/game/game_info.hpp b/src/game/game_info.hpp index f54c9a51ce..8f429a62db 100644 --- a/src/game/game_info.hpp +++ b/src/game/game_info.hpp @@ -16,7 +16,7 @@ class GameInfo : public ScriptInfo { public: /* All valid GameScript API versions, in order. */ - static constexpr std::initializer_list ApiVersions{ "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10", "1.11", "12", "13", "14", "15" }; + static constexpr std::string_view ApiVersions[]{ "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10", "1.11", "12", "13", "14", "15" }; GameInfo();