mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-06 22:39:09 +01:00
core: Fix clang build pt.3
Should finally resolve building with clang.
This commit is contained in:
parent
1fc61d09d3
commit
ea20b5c970
4 changed files with 6 additions and 16 deletions
|
@ -27,7 +27,7 @@ struct Rectangle {
|
||||||
if constexpr (std::is_floating_point_v<T>) {
|
if constexpr (std::is_floating_point_v<T>) {
|
||||||
return std::abs(right - left);
|
return std::abs(right - left);
|
||||||
} else {
|
} else {
|
||||||
return std::abs(static_cast<std::make_signed_t<T>>(right - left));
|
return static_cast<T>(std::abs(static_cast<std::make_signed_t<T>>(right - left)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ struct Rectangle {
|
||||||
if constexpr (std::is_floating_point_v<T>) {
|
if constexpr (std::is_floating_point_v<T>) {
|
||||||
return std::abs(bottom - top);
|
return std::abs(bottom - top);
|
||||||
} else {
|
} else {
|
||||||
return std::abs(static_cast<std::make_signed_t<T>>(bottom - top));
|
return static_cast<T>(std::abs(static_cast<std::make_signed_t<T>>(bottom - top)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ namespace Service::LDR {
|
||||||
|
|
||||||
constexpr ResultCode ERROR_INSUFFICIENT_ADDRESS_SPACE{ErrorModule::RO, 2};
|
constexpr ResultCode ERROR_INSUFFICIENT_ADDRESS_SPACE{ErrorModule::RO, 2};
|
||||||
|
|
||||||
constexpr ResultCode ERROR_INVALID_MEMORY_STATE{ErrorModule::Loader, 51};
|
[[maybe_unused]] constexpr ResultCode ERROR_INVALID_MEMORY_STATE{ErrorModule::Loader, 51};
|
||||||
constexpr ResultCode ERROR_INVALID_NRO{ErrorModule::Loader, 52};
|
constexpr ResultCode ERROR_INVALID_NRO{ErrorModule::Loader, 52};
|
||||||
constexpr ResultCode ERROR_INVALID_NRR{ErrorModule::Loader, 53};
|
constexpr ResultCode ERROR_INVALID_NRR{ErrorModule::Loader, 53};
|
||||||
constexpr ResultCode ERROR_MISSING_NRR_HASH{ErrorModule::Loader, 54};
|
constexpr ResultCode ERROR_MISSING_NRR_HASH{ErrorModule::Loader, 54};
|
||||||
|
@ -33,7 +33,7 @@ constexpr ResultCode ERROR_ALREADY_LOADED{ErrorModule::Loader, 57};
|
||||||
constexpr ResultCode ERROR_INVALID_ALIGNMENT{ErrorModule::Loader, 81};
|
constexpr ResultCode ERROR_INVALID_ALIGNMENT{ErrorModule::Loader, 81};
|
||||||
constexpr ResultCode ERROR_INVALID_SIZE{ErrorModule::Loader, 82};
|
constexpr ResultCode ERROR_INVALID_SIZE{ErrorModule::Loader, 82};
|
||||||
constexpr ResultCode ERROR_INVALID_NRO_ADDRESS{ErrorModule::Loader, 84};
|
constexpr ResultCode ERROR_INVALID_NRO_ADDRESS{ErrorModule::Loader, 84};
|
||||||
constexpr ResultCode ERROR_INVALID_NRR_ADDRESS{ErrorModule::Loader, 85};
|
[[maybe_unused]] constexpr ResultCode ERROR_INVALID_NRR_ADDRESS{ErrorModule::Loader, 85};
|
||||||
constexpr ResultCode ERROR_NOT_INITIALIZED{ErrorModule::Loader, 87};
|
constexpr ResultCode ERROR_NOT_INITIALIZED{ErrorModule::Loader, 87};
|
||||||
|
|
||||||
constexpr std::size_t MAXIMUM_LOADED_RO{0x40};
|
constexpr std::size_t MAXIMUM_LOADED_RO{0x40};
|
||||||
|
|
|
@ -50,19 +50,9 @@ constexpr std::array<std::pair<FontArchives, const char*>, 7> SHARED_FONTS{
|
||||||
std::make_pair(FontArchives::Extension, "nintendo_ext2_003.bfttf"),
|
std::make_pair(FontArchives::Extension, "nintendo_ext2_003.bfttf"),
|
||||||
};
|
};
|
||||||
|
|
||||||
constexpr std::array<const char*, 7> SHARED_FONTS_TTF{
|
|
||||||
"FontStandard.ttf",
|
|
||||||
"FontChineseSimplified.ttf",
|
|
||||||
"FontExtendedChineseSimplified.ttf",
|
|
||||||
"FontChineseTraditional.ttf",
|
|
||||||
"FontKorean.ttf",
|
|
||||||
"FontNintendoExtended.ttf",
|
|
||||||
"FontNintendoExtended2.ttf",
|
|
||||||
};
|
|
||||||
|
|
||||||
// The below data is specific to shared font data dumped from Switch on f/w 2.2
|
// The below data is specific to shared font data dumped from Switch on f/w 2.2
|
||||||
// Virtual address and offsets/sizes likely will vary by dump
|
// Virtual address and offsets/sizes likely will vary by dump
|
||||||
constexpr VAddr SHARED_FONT_MEM_VADDR{0x00000009d3016000ULL};
|
[[maybe_unused]] constexpr VAddr SHARED_FONT_MEM_VADDR{0x00000009d3016000ULL};
|
||||||
constexpr u32 EXPECTED_RESULT{0x7f9a0218}; // What we expect the decrypted bfttf first 4 bytes to be
|
constexpr u32 EXPECTED_RESULT{0x7f9a0218}; // What we expect the decrypted bfttf first 4 bytes to be
|
||||||
constexpr u32 EXPECTED_MAGIC{0x36f81a1e}; // What we expect the encrypted bfttf first 4 bytes to be
|
constexpr u32 EXPECTED_MAGIC{0x36f81a1e}; // What we expect the encrypted bfttf first 4 bytes to be
|
||||||
constexpr u64 SHARED_FONT_MEM_SIZE{0x1100000};
|
constexpr u64 SHARED_FONT_MEM_SIZE{0x1100000};
|
||||||
|
|
|
@ -148,7 +148,7 @@ sockaddr TranslateFromSockAddrIn(SockAddrIn input) {
|
||||||
}
|
}
|
||||||
|
|
||||||
int WSAPoll(WSAPOLLFD* fds, ULONG nfds, int timeout) {
|
int WSAPoll(WSAPOLLFD* fds, ULONG nfds, int timeout) {
|
||||||
return poll(fds, nfds, timeout);
|
return poll(fds, static_cast<nfds_t>(nfds), timeout);
|
||||||
}
|
}
|
||||||
|
|
||||||
int closesocket(SOCKET fd) {
|
int closesocket(SOCKET fd) {
|
||||||
|
|
Loading…
Reference in a new issue