summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar lat9nq2023-06-20 19:26:12 -0400
committerGravatar lat9nq2023-07-21 10:56:55 -0400
commitfdbeb841682b89d4c9fb112786e716f5fac9540c (patch)
tree06759ae036a82dbc7b9fec4d89351dd387c331c3 /src
parentconfiguration: Move speed_limit to core (diff)
downloadyuzu-fdbeb841682b89d4c9fb112786e716f5fac9540c.tar.gz
yuzu-fdbeb841682b89d4c9fb112786e716f5fac9540c.tar.xz
yuzu-fdbeb841682b89d4c9fb112786e716f5fac9540c.zip
settings,uisettings: Remove leading underscore
Diffstat (limited to 'src')
-rw-r--r--src/common/CMakeLists.txt2
-rw-r--r--src/common/settings.cpp2
-rw-r--r--src/common/settings.h2
-rw-r--r--src/yuzu/CMakeLists.txt2
-rw-r--r--src/yuzu/uisettings.cpp2
-rw-r--r--src/yuzu/uisettings.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index cf05ae364..e205055e6 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -205,7 +205,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
205 -Werror=unreachable-code-aggressive 205 -Werror=unreachable-code-aggressive
206 ) 206 )
207 target_compile_definitions(common PRIVATE 207 target_compile_definitions(common PRIVATE
208 $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:_CANNOT_EXPLICITLY_INSTANTIATE> 208 $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:CANNOT_EXPLICITLY_INSTANTIATE>
209 ) 209 )
210endif() 210endif()
211 211
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index f4eb2d2fb..d9948dde8 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -25,7 +25,7 @@
25 25
26namespace Settings { 26namespace Settings {
27 27
28#ifndef _CANNOT_EXPLICITLY_INSTANTIATE 28#ifndef CANNOT_EXPLICITLY_INSTANTIATE
29#define SETTING(TYPE, RANGED) template class Setting<TYPE, RANGED> 29#define SETTING(TYPE, RANGED) template class Setting<TYPE, RANGED>
30#define SWITCHABLE(TYPE, RANGED) template class SwitchableSetting<TYPE, RANGED> 30#define SWITCHABLE(TYPE, RANGED) template class SwitchableSetting<TYPE, RANGED>
31 31
diff --git a/src/common/settings.h b/src/common/settings.h
index c9fe6f045..0ae71dd1b 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -45,7 +45,7 @@ struct ResolutionScalingInfo {
45 } 45 }
46}; 46};
47 47
48#ifndef _CANNOT_EXPLICITLY_INSTANTIATE 48#ifndef CANNOT_EXPLICITLY_INSTANTIATE
49// Instantiate the classes elsewhere (settings.cpp) to reduce compiler/linker work 49// Instantiate the classes elsewhere (settings.cpp) to reduce compiler/linker work
50#define SETTING(TYPE, RANGED) extern template class Setting<TYPE, RANGED> 50#define SETTING(TYPE, RANGED) extern template class Setting<TYPE, RANGED>
51#define SWITCHABLE(TYPE, RANGED) extern template class SwitchableSetting<TYPE, RANGED> 51#define SWITCHABLE(TYPE, RANGED) extern template class SwitchableSetting<TYPE, RANGED>
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index 5183aabdf..2e4da696c 100644
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -237,7 +237,7 @@ endif()
237 237
238if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") 238if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
239 target_compile_definitions(yuzu PRIVATE 239 target_compile_definitions(yuzu PRIVATE
240 $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:_CANNOT_EXPLICITLY_INSTANTIATE> 240 $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:CANNOT_EXPLICITLY_INSTANTIATE>
241 ) 241 )
242endif() 242endif()
243 243
diff --git a/src/yuzu/uisettings.cpp b/src/yuzu/uisettings.cpp
index 41e2493b3..f03dc01dd 100644
--- a/src/yuzu/uisettings.cpp
+++ b/src/yuzu/uisettings.cpp
@@ -3,7 +3,7 @@
3 3
4#include "yuzu/uisettings.h" 4#include "yuzu/uisettings.h"
5 5
6#ifndef _CANNOT_EXPLICITLY_INSTANTIATE 6#ifndef CANNOT_EXPLICITLY_INSTANTIATE
7namespace Settings { 7namespace Settings {
8template class Setting<bool>; 8template class Setting<bool>;
9template class Setting<std::string>; 9template class Setting<std::string>;
diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h
index 08049f9c4..ee8c9f214 100644
--- a/src/yuzu/uisettings.h
+++ b/src/yuzu/uisettings.h
@@ -17,7 +17,7 @@
17using Settings::Category; 17using Settings::Category;
18using Settings::Setting; 18using Settings::Setting;
19 19
20#ifndef _CANNOT_EXPLICITLY_INSTANTIATE 20#ifndef CANNOT_EXPLICITLY_INSTANTIATE
21namespace Settings { 21namespace Settings {
22extern template class Setting<bool>; 22extern template class Setting<bool>;
23extern template class Setting<std::string>; 23extern template class Setting<std::string>;