mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2024-11-23 01:59:22 +01:00
externals: Update fmt from 10.2.1 to 11.0.2
This commit is contained in:
parent
84b45f6045
commit
c7818ef16f
2
externals/dynarmic
vendored
2
externals/dynarmic
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 4bad3035b8e6af836e4f7e338e48017ef580e563
|
Subproject commit 61c0090913ddd583a3ae2ecdd254baec0d4b2565
|
2
externals/fmt
vendored
2
externals/fmt
vendored
@ -1 +1 @@
|
|||||||
Subproject commit e69e5f977d458f2650bb346dadf2ad30c5320281
|
Subproject commit 0c9fce2ffefecfdce794e1859584e25877b7b592
|
@ -1,4 +1,4 @@
|
|||||||
// Copyright 2022 Citra Emulator Project
|
// Copyright Citra Emulator Project / Lime3DS Emulator Project
|
||||||
// Licensed under GPLv2 or any later version
|
// Licensed under GPLv2 or any later version
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
@ -12,9 +12,9 @@
|
|||||||
#if FMT_VERSION >= 80100
|
#if FMT_VERSION >= 80100
|
||||||
template <typename T>
|
template <typename T>
|
||||||
struct fmt::formatter<T, std::enable_if_t<std::is_enum_v<T>, char>>
|
struct fmt::formatter<T, std::enable_if_t<std::is_enum_v<T>, char>>
|
||||||
: formatter<std::underlying_type_t<T>> {
|
: fmt::formatter<std::underlying_type_t<T>> {
|
||||||
template <typename FormatContext>
|
template <typename FormatContext>
|
||||||
auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) {
|
auto format(const T& value, FormatContext& ctx) const -> decltype(ctx.out()) {
|
||||||
return fmt::formatter<std::underlying_type_t<T>>::format(
|
return fmt::formatter<std::underlying_type_t<T>>::format(
|
||||||
static_cast<std::underlying_type_t<T>>(value), ctx);
|
static_cast<std::underlying_type_t<T>>(value), ctx);
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
// Copyright 2014 Citra Emulator Project
|
// Copyright Citra Emulator Project / Lime3DS Emulator Project
|
||||||
// Licensed under GPLv2 or any later version
|
// Licensed under GPLv2 or any later version
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
@ -9,7 +9,7 @@
|
|||||||
#include <boost/serialization/unique_ptr.hpp>
|
#include <boost/serialization/unique_ptr.hpp>
|
||||||
#include <cryptopp/osrng.h>
|
#include <cryptopp/osrng.h>
|
||||||
#include <cryptopp/sha.h>
|
#include <cryptopp/sha.h>
|
||||||
#include <fmt/format.h>
|
#include <fmt/ranges.h>
|
||||||
#include "common/archives.h"
|
#include "common/archives.h"
|
||||||
#include "common/file_util.h"
|
#include "common/file_util.h"
|
||||||
#include "common/logging/log.h"
|
#include "common/logging/log.h"
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
// Copyright 2017 Citra Emulator Project
|
// Copyright Citra Emulator Project / Lime3DS Emulator Project
|
||||||
// Licensed under GPLv2 or any later version
|
// Licensed under GPLv2 or any later version
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include <fmt/format.h>
|
#include <fmt/ranges.h>
|
||||||
#include "common/alignment.h"
|
#include "common/alignment.h"
|
||||||
#include "common/settings.h"
|
#include "common/settings.h"
|
||||||
#include "core/core_timing.h"
|
#include "core/core_timing.h"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
// Copyright 2015 Citra Emulator Project
|
// Copyright Citra Emulator Project / Lime3DS Emulator Project
|
||||||
// Licensed under GPLv2 or any later version
|
// Licensed under GPLv2 or any later version
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
@ -8,7 +8,7 @@
|
|||||||
#include <boost/serialization/base_object.hpp>
|
#include <boost/serialization/base_object.hpp>
|
||||||
#include <boost/serialization/shared_ptr.hpp>
|
#include <boost/serialization/shared_ptr.hpp>
|
||||||
#include <boost/serialization/unique_ptr.hpp>
|
#include <boost/serialization/unique_ptr.hpp>
|
||||||
#include <fmt/format.h>
|
#include <fmt/ranges.h>
|
||||||
#include "common/archives.h"
|
#include "common/archives.h"
|
||||||
#include "common/swap.h"
|
#include "common/swap.h"
|
||||||
#include "core/core.h"
|
#include "core/core.h"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
// Copyright 2014 Citra Emulator Project
|
// Copyright Citra Emulator Project / Lime3DS Emulator Project
|
||||||
// Licensed under GPLv2 or any later version
|
// Licensed under GPLv2 or any later version
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
@ -2236,18 +2236,15 @@ std::optional<SOC_U::InterfaceInfo> SOC_U::GetDefaultInterfaceInfo() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
InterfaceInfo ret;
|
InterfaceInfo ret;
|
||||||
#ifdef _WIN32
|
|
||||||
SOCKET sock_fd = -1;
|
SocketHolder::SOCKET sock_fd = -1;
|
||||||
#else
|
|
||||||
int sock_fd = -1;
|
|
||||||
#endif
|
|
||||||
bool interface_found = false;
|
bool interface_found = false;
|
||||||
struct sockaddr_in s_in = {.sin_family = AF_INET, .sin_port = htons(53), .sin_addr = {}};
|
struct sockaddr_in s_in = {.sin_family = AF_INET, .sin_port = htons(53), .sin_addr = {}};
|
||||||
s_in.sin_addr.s_addr = inet_addr("8.8.8.8");
|
s_in.sin_addr.s_addr = inet_addr("8.8.8.8");
|
||||||
socklen_t s_info_len = sizeof(struct sockaddr_in);
|
socklen_t s_info_len = sizeof(struct sockaddr_in);
|
||||||
sockaddr_in s_info;
|
sockaddr_in s_info;
|
||||||
|
|
||||||
if (static_cast<int>(sock_fd = ::socket(AF_INET, SOCK_STREAM, 0)) == -1) {
|
if ((sock_fd = ::socket(AF_INET, SOCK_STREAM, 0)) == static_cast<SocketHolder::SOCKET>(-1)) {
|
||||||
return std::nullopt;
|
return std::nullopt;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2265,7 +2262,7 @@ std::optional<SOC_U::InterfaceInfo> SOC_U::GetDefaultInterfaceInfo() {
|
|||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
sock_fd = WSASocket(AF_INET, SOCK_DGRAM, 0, 0, 0, 0);
|
sock_fd = WSASocket(AF_INET, SOCK_DGRAM, 0, 0, 0, 0);
|
||||||
if (static_cast<int>(sock_fd) == SOCKET_ERROR) {
|
if (sock_fd == static_cast<SocketHolder::SOCKET>(SOCKET_ERROR)) {
|
||||||
return std::nullopt;
|
return std::nullopt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
// Copyright 2014 Citra Emulator Project
|
// Copyright Citra Emulator Project / Lime3DS Emulator Project
|
||||||
// Licensed under GPLv2 or any later version
|
// Licensed under GPLv2 or any later version
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
@ -25,11 +25,11 @@ namespace Service::SOC {
|
|||||||
struct SocketHolder {
|
struct SocketHolder {
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
using SOCKET = unsigned long long;
|
using SOCKET = unsigned long long;
|
||||||
SOCKET socket_fd; ///< The socket descriptor
|
|
||||||
#else
|
#else
|
||||||
int socket_fd; ///< The socket descriptor
|
using SOCKET = int;
|
||||||
#endif // _WIN32
|
#endif // _WIN32
|
||||||
|
|
||||||
|
SOCKET socket_fd; ///< The socket descriptor
|
||||||
bool blocking = true; ///< Whether the socket is blocking or not.
|
bool blocking = true; ///< Whether the socket is blocking or not.
|
||||||
bool isGlobal = false;
|
bool isGlobal = false;
|
||||||
bool shutdown_rd = false;
|
bool shutdown_rd = false;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
// Copyright 2017 Citra Emulator Project
|
// Copyright Citra Emulator Project / Lime3DS Emulator Project
|
||||||
// Licensed under GPLv2 or any later version
|
// Licensed under GPLv2 or any later version
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
@ -10,6 +10,7 @@
|
|||||||
#include <boost/optional.hpp>
|
#include <boost/optional.hpp>
|
||||||
#include <cryptopp/hex.h>
|
#include <cryptopp/hex.h>
|
||||||
#include <cryptopp/osrng.h>
|
#include <cryptopp/osrng.h>
|
||||||
|
#include <fmt/ranges.h>
|
||||||
#include "common/archives.h"
|
#include "common/archives.h"
|
||||||
#include "common/bit_field.h"
|
#include "common/bit_field.h"
|
||||||
#include "common/file_util.h"
|
#include "common/file_util.h"
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
// Copyright 2020 Citra Emulator Project
|
// Copyright Citra Emulator Project / Lime3DS Emulator Project
|
||||||
// Licensed under GPLv2 or any later version
|
// Licensed under GPLv2 or any later version
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <cryptopp/hex.h>
|
#include <cryptopp/hex.h>
|
||||||
#include <fmt/format.h>
|
#include <fmt/ranges.h>
|
||||||
#include "common/archives.h"
|
#include "common/archives.h"
|
||||||
#include "common/file_util.h"
|
#include "common/file_util.h"
|
||||||
#include "common/logging/log.h"
|
#include "common/logging/log.h"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
// Copyright 2024 Citra Emulator Project
|
// Copyright Citra Emulator Project / Lime3DS Emulator Project
|
||||||
// Licensed under GPLv2 or any later version
|
// Licensed under GPLv2 or any later version
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
@ -238,7 +238,7 @@ bool Client::Connect() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
main_socket = ::socket(AF_INET, SOCK_STREAM, 0);
|
main_socket = ::socket(AF_INET, SOCK_STREAM, 0);
|
||||||
if (main_socket == -1) {
|
if (main_socket == static_cast<SocketHolder>(-1)) {
|
||||||
LOG_ERROR(Network, "Failed to create socket");
|
LOG_ERROR(Network, "Failed to create socket");
|
||||||
SignalCommunicationError();
|
SignalCommunicationError();
|
||||||
return false;
|
return false;
|
||||||
@ -622,7 +622,7 @@ std::optional<ArticBaseCommon::DataPacket> Client::SendRequestPacket(
|
|||||||
const std::chrono::nanoseconds& read_timeout) {
|
const std::chrono::nanoseconds& read_timeout) {
|
||||||
std::scoped_lock<std::mutex> l(send_mutex);
|
std::scoped_lock<std::mutex> l(send_mutex);
|
||||||
|
|
||||||
if (main_socket == -1) {
|
if (main_socket == static_cast<SocketHolder>(-1)) {
|
||||||
return std::nullopt;
|
return std::nullopt;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -690,7 +690,7 @@ Client::Handler::Handler(Client& _client, u32 _addr, u16 _port, int _id)
|
|||||||
|
|
||||||
void Client::Handler::RunLoop() {
|
void Client::Handler::RunLoop() {
|
||||||
handler_socket = ::socket(AF_INET, SOCK_STREAM, 0);
|
handler_socket = ::socket(AF_INET, SOCK_STREAM, 0);
|
||||||
if (handler_socket == -1) {
|
if (handler_socket == static_cast<SocketHolder>(-1)) {
|
||||||
LOG_ERROR(Network, "Failed to create socket");
|
LOG_ERROR(Network, "Failed to create socket");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -836,4 +836,4 @@ void Client::OnAllHandlersFinished() {
|
|||||||
pending_responses.clear();
|
pending_responses.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Network::ArticBase
|
} // namespace Network::ArticBase
|
||||||
|
@ -1,9 +1,10 @@
|
|||||||
// Copyright 2023 Citra Emulator Project
|
// Copyright Citra Emulator Project / Lime3DS Emulator Project
|
||||||
// Licensed under GPLv2 or any later version
|
// Licensed under GPLv2 or any later version
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
|
#include <tuple>
|
||||||
#include "video_core/pica/regs_texturing.h"
|
#include "video_core/pica/regs_texturing.h"
|
||||||
#include "video_core/renderer_software/sw_clipper.h"
|
#include "video_core/renderer_software/sw_clipper.h"
|
||||||
|
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
// Copyright 2023 Citra Emulator Project
|
// Copyright Citra Emulator Project / Lime3DS Emulator Project
|
||||||
// Licensed under GPLv2 or any later version
|
// Licensed under GPLv2 or any later version
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include <span>
|
#include <span>
|
||||||
#include <boost/container/static_vector.hpp>
|
#include <boost/container/static_vector.hpp>
|
||||||
#include <fmt/format.h>
|
#include <fmt/ranges.h>
|
||||||
|
|
||||||
#include "common/assert.h"
|
#include "common/assert.h"
|
||||||
#include "common/settings.h"
|
#include "common/settings.h"
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
// Copyright 2023 Citra Emulator Project
|
// Copyright Citra Emulator Project / Lime3DS Emulator Project
|
||||||
// Licensed under GPLv2 or any later version
|
// Licensed under GPLv2 or any later version
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
#include <SPIRV/GlslangToSpv.h>
|
#include <SPIRV/GlslangToSpv.h>
|
||||||
#include <glslang/Include/ResourceLimits.h>
|
#include <glslang/Include/ResourceLimits.h>
|
||||||
#include <glslang/Public/ShaderLang.h>
|
#include <glslang/Public/ShaderLang.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user