Move fmt baseline to 5.0.0

edo9300 · Aug 21, 2024 · 29216bd · 29216bd
1 parent a582248
commit 29216bd
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/gframe/duelclient.cpp b/gframe/duelclient.cpp
@@ -1,6 +1,5 @@
 #include <algorithm>
 #include "config.h"
-#include <fmt/chrono.h>
 #if EDOPRO_WINDOWS
 #include <ws2tcpip.h>
 #else

diff --git a/gframe/fmt.h b/gframe/fmt.h
@@ -4,13 +4,12 @@
 #define FMT_UNICODE 0
 #endif
 #include <fmt/core.h>
-static_assert(FMT_VERSION >= 50300, "Fmt 5.3.0 or greater is required");
+static_assert(FMT_VERSION >= 50000, "Fmt 5.0.0 or greater is required");
 #include <fmt/printf.h>
-#if FMT_VERSION >= 80000
+#if FMT_VERSION >= 80000 || FMT_VERSION < 50300
 #include <utility> //std::forward
-#include <fmt/xchar.h>
-
 #include "compiler_features.h"
+
 #define FMT_ADL_FUNCTION_NAME adapt_string_view
 #define OVERRIDE_FMT(func) template<typename... Args>\
 ForceInline decltype(auto) func(Args&&... args) {\
@@ -21,12 +20,17 @@ constexpr ForceInline const T& FMT_ADL_FUNCTION_NAME(const T& obj) {
     return obj;
 }
 #else
-#if FMT_VERSION < 60000
-#include <fmt/time.h>
-#endif
 #define FMT_ADL_FUNCTION_NAME to_string_view
 #define OVERRIDE_FMT(func) using fmt::func;
 #endif
+#if FMT_VERSION >= 80000
+#include <fmt/xchar.h>
+#endif
+#if FMT_VERSION >= 60000
+#include <fmt/chrono.h>
+#else
+#include <fmt/time.h>
+#endif
 
 namespace nonstd { namespace sv_lite {
 template<class CharT, class Traits>

diff --git a/gframe/logging.cpp b/gframe/logging.cpp
@@ -1,6 +1,5 @@
 #include "logging.h"
 #include <ctime>
-#include <fmt/chrono.h>
 #include "file_stream.h"
 
 namespace ygo {

diff --git a/gframe/menu_handler.cpp b/gframe/menu_handler.cpp
@@ -1,5 +1,4 @@
 #include "config.h"
-#include <fmt/chrono.h>
 #include "client_updater.h"
 #include "game_config.h"
 #include "menu_handler.h"
@@ -665,7 +664,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				if(sel == -1)
 					break;
 				const auto& selection = DuelClient::hosts[sel];
-				mainGame->ebJoinHost->setText(fmt::to_wstring(selection.address).data());
+				mainGame->ebJoinHost->setText(fmt::format(L"{}", selection.address).data());
 				mainGame->ebJoinPort->setText(fmt::to_wstring(selection.port).data());
 				break;
 			}

diff --git a/gframe/single_mode.cpp b/gframe/single_mode.cpp
@@ -1,5 +1,4 @@
 #include "single_mode.h"
-#include <fmt/chrono.h>
 #include "game_config.h"
 #include "duelclient.h"
 #include "game.h"

diff --git a/gframe/utils_gui.cpp b/gframe/utils_gui.cpp
@@ -1,7 +1,6 @@
 #include "utils_gui.h"
 #include <irrlicht.h>
 #include <ICursorControl.h>
-#include <fmt/chrono.h>
 #include "config.h"
 #include "utils.h"
 #include "game_config.h"