From b7518fc26cbbace4fce3c6228b57e1e6d55195ee Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 2 Mar 2019 14:55:49 -0500 Subject: [PATCH 1/3] web_service: Remove unnecessary inclusions Reduces the potential amount of rebuilding necessary if any headers change. In particular, we were including a header from the core library when we don't even link the core library to the web_service library, so this also gets rid of an indirect dependency. --- src/web_service/verify_login.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/web_service/verify_login.h b/src/web_service/verify_login.h index 93eb4036f..5dcc006dc 100644 --- a/src/web_service/verify_login.h +++ b/src/web_service/verify_login.h @@ -4,8 +4,6 @@ #pragma once -#include -#include #include namespace WebService { From aba5dae5574ce5063075cccb7c6a06408ce1ab4f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 10 Mar 2019 18:00:54 -0400 Subject: [PATCH 2/3] service/service: Remove unncessary calls to c_str() These can just be passed regularly, now that we use fmt instead of our old logging system. While we're at it, make the parameters to MakeFunctionString std::string_views. --- src/core/hle/service/service.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index a4ccf429e..41156f858 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -112,7 +112,8 @@ const std::array service_module_map{ * Creates a function string for logging, complete with the name (or header code, depending * on what's passed in) the port name, and all the cmd_buff arguments. */ -[[maybe_unused]] static std::string MakeFunctionString(const char* name, const char* port_name, +[[maybe_unused]] static std::string MakeFunctionString(std::string_view name, + std::string_view port_name, const u32* cmd_buff) { // Number of params == bits 0-5 + bits 6-11 int num_params = (cmd_buff[0] & 0x3F) + ((cmd_buff[0] >> 6) & 0x3F); @@ -179,7 +180,7 @@ void ServiceFrameworkBase::HandleSyncRequest(Kernel::HLERequestContext& context) } LOG_TRACE(Service, "{}", - MakeFunctionString(info->name, GetServiceName().c_str(), context.CommandBuffer())); + MakeFunctionString(info->name, GetServiceName(), context.CommandBuffer())); handler_invoker(this, info->handler_callback, context); } From c0ceecd7cde9a194d2a302be87c29fe1078e29a0 Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Fri, 15 Mar 2019 16:59:57 +0100 Subject: [PATCH 3/3] yuzu_cmd/config: Silent implicit cast warning Also replaces (float) with static_cast(...) for consistency. --- src/citra/config.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/citra/config.cpp b/src/citra/config.cpp index 70f05b7b5..c08a3d607 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -131,9 +131,10 @@ void Config::ReadValues() { Settings::values.factor_3d = static_cast(sdl2_config->GetInteger("Renderer", "factor_3d", 0)); - Settings::values.bg_red = (float)sdl2_config->GetReal("Renderer", "bg_red", 0.0); - Settings::values.bg_green = (float)sdl2_config->GetReal("Renderer", "bg_green", 0.0); - Settings::values.bg_blue = (float)sdl2_config->GetReal("Renderer", "bg_blue", 0.0); + Settings::values.bg_red = static_cast(sdl2_config->GetReal("Renderer", "bg_red", 0.0)); + Settings::values.bg_green = + static_cast(sdl2_config->GetReal("Renderer", "bg_green", 0.0)); + Settings::values.bg_blue = static_cast(sdl2_config->GetReal("Renderer", "bg_blue", 0.0)); // Layout Settings::values.layout_option = @@ -165,7 +166,7 @@ void Config::ReadValues() { Settings::values.enable_audio_stretching = sdl2_config->GetBoolean("Audio", "enable_audio_stretching", true); Settings::values.audio_device_id = sdl2_config->GetString("Audio", "output_device", "auto"); - Settings::values.volume = sdl2_config->GetReal("Audio", "volume", 1); + Settings::values.volume = static_cast(sdl2_config->GetReal("Audio", "volume", 1)); Settings::values.mic_input_device = sdl2_config->GetString("Audio", "mic_input_device", "Default"); Settings::values.mic_input_type =