فهرست منبع

settings,uisettings: Remove leading underscore

lat9nq 3 سال پیش
والد
کامیت
fdbeb84168
6فایلهای تغییر یافته به همراه6 افزوده شده و 6 حذف شده
  1. 1 1
      src/common/CMakeLists.txt
  2. 1 1
      src/common/settings.cpp
  3. 1 1
      src/common/settings.h
  4. 1 1
      src/yuzu/CMakeLists.txt
  5. 1 1
      src/yuzu/uisettings.cpp
  6. 1 1
      src/yuzu/uisettings.h

+ 1 - 1
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()
 

+ 1 - 1
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>
 

+ 1 - 1
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>

+ 1 - 1
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()
 

+ 1 - 1
src/yuzu/uisettings.cpp

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

+ 1 - 1
src/yuzu/uisettings.h

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