diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/common/settings.cpp | 2 | ||||
| -rw-r--r-- | src/common/settings.h | 2 |
3 files changed, 3 insertions, 3 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 | ) |
| 210 | endif() | 210 | endif() |
| 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 | ||
| 26 | namespace Settings { | 26 | namespace 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> |