Browse Source

[*] Fix compilation on fmt 12.2.0 (#4107)

Signed-off-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4107
Reviewed-by: Lizzie <lizzie@eden-emu.dev>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
pull/4109/head
crueter 1 day ago
parent
commit
7c0e993b5b
No known key found for this signature in database GPG Key ID: 425ACD2D4830EBC6
  1. 8
      src/common/dynamic_library.cpp
  2. 2
      src/common/logging.h
  3. 6
      src/common/settings_setting.h

8
src/common/dynamic_library.cpp

@ -1,7 +1,15 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: 2019 Dolphin Emulator Project // SPDX-FileCopyrightText: 2019 Dolphin Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include <string> #include <string>
#ifndef _WIN32
#include <cstring>
#endif
#include <utility> #include <utility>
#include <fmt/ranges.h> #include <fmt/ranges.h>

2
src/common/logging.h

@ -89,7 +89,7 @@ void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename, u
template <typename... Args> template <typename... Args>
void FmtLogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num, const char* function, fmt::format_string<Args...> format, const Args&... args) { void FmtLogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_num, const char* function, fmt::format_string<Args...> format, const Args&... args) {
FmtLogMessageImpl(log_class, log_level, filename, line_num, function, format, fmt::make_format_args(args...));
FmtLogMessageImpl(log_class, log_level, filename, line_num, function, format.get(), fmt::make_format_args(args...));
} }
/// Implements a log message filter which allows different log classes to have different minimum /// Implements a log message filter which allows different log classes to have different minimum

6
src/common/settings_setting.h

@ -6,15 +6,13 @@
#pragma once #pragma once
#include <algorithm>
#include <limits> #include <limits>
#include <map>
#include <optional> #include <optional>
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
#include <type_traits> #include <type_traits>
#include <typeindex>
#include <typeinfo>
#include <fmt/core.h>
#include <fmt/ranges.h>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/settings_common.h" #include "common/settings_common.h"
#include "common/settings_enums.h" #include "common/settings_enums.h"

Loading…
Cancel
Save