piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12190 from AdmiralCurtiss/fmt10

Browse Source 
Update fmt to 10.1.1
This commit is contained in:
Admiral H. Curtiss
2023-09-24 00:05:00 +02:00
committed by GitHub
parent c0f690b780 63467559b2
commit c67cd65b53
59 changed files with 60 additions and 25882 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Common/HRWrap.cpp
View File

@ -3,8 +3,6 @@
#include "HRWrap.h"
#include <winrt/base.h>
namespace Common
{
std::string GetHResultMessage(HRESULT hr)
@ -12,4 +10,8 @@ std::string GetHResultMessage(HRESULT hr)
auto err = winrt::hresult_error(hr);
return winrt::to_string(err.message());
}
std::string GetHResultMessage(const winrt::hresult& hr)
{
return GetHResultMessage(hr.value);
}
} // namespace Common

12
Source/Core/Common/HRWrap.h
View File

@ -6,6 +6,7 @@
#include <fmt/format.h>
#include <string>
#include <winerror.h>
#include <winrt/base.h>
#include "Common/CommonTypes.h"
@ -33,3 +34,14 @@ struct fmt::formatter<Common::HRWrap>
static_cast<u32>(hr.m_hr));
}
};
template <>
struct fmt::formatter<winrt::hresult>
{
constexpr auto parse(fmt::format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext>
auto format(const winrt::hresult& hr, FormatContext& ctx) const
{
return fmt::format_to(ctx.out(), "{} ({:#010x})", Common::GetHResultMessage(hr), hr.value);
}
};

14
Source/Core/Common/Swap.h
View File

@ -16,6 +16,8 @@
#include <endian.h>
#endif
#include <fmt/format.h>
#include "Common/CommonTypes.h"
namespace Common
@ -183,3 +185,15 @@ private:
value_type raw;
};
} // Namespace Common
template <typename value_type>
struct fmt::formatter<Common::BigEndianValue<value_type>>
{
fmt::formatter<value_type> m_formatter;
constexpr auto parse(format_parse_context& ctx) { return m_formatter.parse(ctx); }
template <typename FormatContext>
auto format(const Common::BigEndianValue<value_type>& value, FormatContext& ctx) const
{
return m_formatter.format(value.operator value_type(), ctx);
}
};

5
Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp
View File

@ -23,6 +23,7 @@
#include <fmt/format.h>
#include "Common/HRWrap.h"
#include "Common/Logging/Log.h"
#include "Common/StringUtil.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
@ -506,7 +507,7 @@ private:
catch (winrt::hresult_error error)
{
ERROR_LOG_FMT(CONTROLLERINTERFACE,
"WGInput: IRawGameController::GetCurrentReading failed: {:x}", error.code());
"WGInput: IRawGameController::GetCurrentReading failed: {}", error.code());
}
// IGamepad:
@ -518,7 +519,7 @@ private:
}
catch (winrt::hresult_error error)
{
ERROR_LOG_FMT(CONTROLLERINTERFACE, "WGInput: IGamepad::GetCurrentReading failed: {:x}",
ERROR_LOG_FMT(CONTROLLERINTERFACE, "WGInput: IGamepad::GetCurrentReading failed: {}",
error.code());
}
}

3
Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp
View File

@ -4,7 +4,8 @@
#include "VideoCommon/Assets/DirectFilesystemAssetLibrary.h"
#include <algorithm>
#include <fmt/os.h>
#include <fmt/std.h>
#include "Common/FileUtil.h"
#include "Common/Logging/Log.h"

2
Source/Core/VideoCommon/BPMemory.h
View File

@ -1863,7 +1863,7 @@ enum class ColorChannel : u32
template <>
struct fmt::formatter<ColorChannel> : EnumFormatter<ColorChannel::Alpha>
{
formatter() : EnumFormatter({"Red", "Green", "Blue", "Alpha"}) {}
constexpr formatter() : EnumFormatter({"Red", "Green", "Blue", "Alpha"}) {}
};
enum class KonstSel : u32

1
Source/Core/VideoCommon/TextureCacheBase.h
View File

@ -98,7 +98,6 @@ struct EFBCopyParams
template <>
struct fmt::formatter<EFBCopyParams>
{
std::shared_ptr<int> state;
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext>
auto format(const EFBCopyParams& uid, FormatContext& ctx) const