diff options
author | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2023-06-21 01:26:12 +0200 |
---|---|---|
committer | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2023-07-21 16:56:55 +0200 |
commit | fdbeb841682b89d4c9fb112786e716f5fac9540c (patch) | |
tree | 06759ae036a82dbc7b9fec4d89351dd387c331c3 /src | |
parent | configuration: Move speed_limit to core (diff) | |
download | yuzu-fdbeb841682b89d4c9fb112786e716f5fac9540c.tar yuzu-fdbeb841682b89d4c9fb112786e716f5fac9540c.tar.gz yuzu-fdbeb841682b89d4c9fb112786e716f5fac9540c.tar.bz2 yuzu-fdbeb841682b89d4c9fb112786e716f5fac9540c.tar.lz yuzu-fdbeb841682b89d4c9fb112786e716f5fac9540c.tar.xz yuzu-fdbeb841682b89d4c9fb112786e716f5fac9540c.tar.zst yuzu-fdbeb841682b89d4c9fb112786e716f5fac9540c.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/common/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/common/settings.cpp | 2 | ||||
-rw-r--r-- | src/common/settings.h | 2 | ||||
-rw-r--r-- | src/yuzu/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/yuzu/uisettings.cpp | 2 | ||||
-rw-r--r-- | src/yuzu/uisettings.h | 2 |
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") -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.cpp index f4eb2d2fb..d9948dde8 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.h index c9fe6f045..0ae71dd1b 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.txt index 5183aabdf..2e4da696c 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.cpp index 41e2493b3..f03dc01dd 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_INSTANTIATE namespace Settings { template class Setting<bool>; template 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 @@ 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>; |