yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

settings,uisettings: Remove leading underscore

This commit is contained in:
lat9nq 2023-06-20 19:26:12 -04:00
parent 81a96bafe2
commit fdbeb84168
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/CMakeLists.txt
View File

@ -205,7 +205,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-Werror=unreachable-code-aggressive -Werror=unreachable-code-aggressive
) )
target_compile_definitions(common PRIVATE target_compile_definitions(common PRIVATE
$<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:_CANNOT_EXPLICITLY_INSTANTIATE> $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:CANNOT_EXPLICITLY_INSTANTIATE>
) )
endif() endif()

2
src/common/settings.cpp
View File

@ -25,7 +25,7 @@
namespace Settings { namespace Settings {
#ifndef _CANNOT_EXPLICITLY_INSTANTIATE #ifndef CANNOT_EXPLICITLY_INSTANTIATE
#define SETTING(TYPE, RANGED) template class Setting<TYPE, RANGED> #define SETTING(TYPE, RANGED) template class Setting<TYPE, RANGED>
#define SWITCHABLE(TYPE, RANGED) template class SwitchableSetting<TYPE, RANGED> #define SWITCHABLE(TYPE, RANGED) template class SwitchableSetting<TYPE, RANGED>

2
src/common/settings.h
View File

@ -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 // Instantiate the classes elsewhere (settings.cpp) to reduce compiler/linker work
#define SETTING(TYPE, RANGED) extern template class Setting<TYPE, RANGED> #define SETTING(TYPE, RANGED) extern template class Setting<TYPE, RANGED>
#define SWITCHABLE(TYPE, RANGED) extern template class SwitchableSetting<TYPE, RANGED> #define SWITCHABLE(TYPE, RANGED) extern template class SwitchableSetting<TYPE, RANGED>

2
src/yuzu/CMakeLists.txt
View File

@ -237,7 +237,7 @@ endif()
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
target_compile_definitions(yuzu PRIVATE target_compile_definitions(yuzu PRIVATE
$<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:_CANNOT_EXPLICITLY_INSTANTIATE> $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:CANNOT_EXPLICITLY_INSTANTIATE>
) )
endif() endif()

2
src/yuzu/uisettings.cpp
View File

@ -3,7 +3,7 @@
#include "yuzu/uisettings.h" #include "yuzu/uisettings.h"
#ifndef _CANNOT_EXPLICITLY_INSTANTIATE #ifndef CANNOT_EXPLICITLY_INSTANTIATE
namespace Settings { namespace Settings {
template class Setting<bool>; template class Setting<bool>;
template class Setting<std::string>; template class Setting<std::string>;

2
src/yuzu/uisettings.h
View File

@ -17,7 +17,7 @@
using Settings::Category; using Settings::Category;
using Settings::Setting; using Settings::Setting;
#ifndef _CANNOT_EXPLICITLY_INSTANTIATE #ifndef CANNOT_EXPLICITLY_INSTANTIATE
namespace Settings { namespace Settings {
extern template class Setting<bool>; extern template class Setting<bool>;
extern template class Setting<std::string>; extern template class Setting<std::string>;