VERY experimental Nintendo Switch 2 emulator
C++
settings,uisettings: Remove leading underscore
lat9nqc0e9075d6b8f
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txtindex cf05ae3640..e205055e62 100644--- a/src/common/CMakeLists.txt+++ b/src/common/CMakeLists.txt@@ -205,7 +205,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")-Werror=unreachable-code-aggressive)target_compile_definitions(common PRIVATE- $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:_CANNOT_EXPLICITLY_INSTANTIATE>+ $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:CANNOT_EXPLICITLY_INSTANTIATE>)endif()diff --git a/src/common/settings.cpp b/src/common/settings.cppindex f4eb2d2fbe..d9948dde87 100644--- a/src/common/settings.cpp+++ b/src/common/settings.cpp@@ -25,7 +25,7 @@namespace Settings {-#ifndef _CANNOT_EXPLICITLY_INSTANTIATE+#ifndef CANNOT_EXPLICITLY_INSTANTIATE#define SETTING(TYPE, RANGED) template class Setting<TYPE, RANGED>#define SWITCHABLE(TYPE, RANGED) template class SwitchableSetting<TYPE, RANGED>diff --git a/src/common/settings.h b/src/common/settings.hindex c9fe6f0458..0ae71dd1b4 100644--- a/src/common/settings.h+++ b/src/common/settings.h@@ -45,7 +45,7 @@ struct ResolutionScalingInfo {}};-#ifndef _CANNOT_EXPLICITLY_INSTANTIATE+#ifndef CANNOT_EXPLICITLY_INSTANTIATE// Instantiate the classes elsewhere (settings.cpp) to reduce compiler/linker work#define SETTING(TYPE, RANGED) extern template class Setting<TYPE, RANGED>#define SWITCHABLE(TYPE, RANGED) extern template class SwitchableSetting<TYPE, RANGED>diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txtindex 5183aabdfe..2e4da696c0 100644--- a/src/yuzu/CMakeLists.txt+++ b/src/yuzu/CMakeLists.txt@@ -237,7 +237,7 @@ endif()if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")target_compile_definitions(yuzu PRIVATE- $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:_CANNOT_EXPLICITLY_INSTANTIATE>+ $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:CANNOT_EXPLICITLY_INSTANTIATE>)endif()diff --git a/src/yuzu/uisettings.cpp b/src/yuzu/uisettings.cppindex 41e2493b3b..f03dc01ddc 100644--- a/src/yuzu/uisettings.cpp+++ b/src/yuzu/uisettings.cpp@@ -3,7 +3,7 @@#include "yuzu/uisettings.h"-#ifndef _CANNOT_EXPLICITLY_INSTANTIATE+#ifndef CANNOT_EXPLICITLY_INSTANTIATEnamespace Settings {template class Setting<bool>;template class Setting<std::string>;diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.hindex 08049f9c45..ee8c9f2148 100644--- a/src/yuzu/uisettings.h+++ b/src/yuzu/uisettings.h@@ -17,7 +17,7 @@using Settings::Category;using Settings::Setting;-#ifndef _CANNOT_EXPLICITLY_INSTANTIATE+#ifndef CANNOT_EXPLICITLY_INSTANTIATEnamespace Settings {extern template class Setting<bool>;extern template class Setting<std::string>;