Browse Source

settings,uisettings: Remove leading underscore

nce_cpp
lat9nq 3 years ago
parent
commit
c0e9075d6b
  1. 2
      src/common/CMakeLists.txt
  2. 2
      src/common/settings.cpp
  3. 2
      src/common/settings.h
  4. 2
      src/yuzu/CMakeLists.txt
  5. 2
      src/yuzu/uisettings.cpp
  6. 2
      src/yuzu/uisettings.h

2
src/common/CMakeLists.txt

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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>;

Loading…
Cancel
Save