diff options
author | Liam <byteslice@airmail.cc> | 2023-08-10 02:58:47 +0200 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-08-10 04:38:37 +0200 |
commit | 023b9b38cc9c6d31f1a01c29ac324c535308fa59 (patch) | |
tree | 3a7708c421d12e1840b772c18ce2f17e1dfbda97 /src/common/settings_setting.h | |
parent | Merge pull request #11216 from lat9nq/no-mesa-astc (diff) | |
download | yuzu-023b9b38cc9c6d31f1a01c29ac324c535308fa59.tar yuzu-023b9b38cc9c6d31f1a01c29ac324c535308fa59.tar.gz yuzu-023b9b38cc9c6d31f1a01c29ac324c535308fa59.tar.bz2 yuzu-023b9b38cc9c6d31f1a01c29ac324c535308fa59.tar.lz yuzu-023b9b38cc9c6d31f1a01c29ac324c535308fa59.tar.xz yuzu-023b9b38cc9c6d31f1a01c29ac324c535308fa59.tar.zst yuzu-023b9b38cc9c6d31f1a01c29ac324c535308fa59.zip |
Diffstat (limited to '')
-rw-r--r-- | src/common/settings_setting.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h index a8beb06e9..e10843c73 100644 --- a/src/common/settings_setting.h +++ b/src/common/settings_setting.h @@ -190,7 +190,7 @@ public: } } - [[nodiscard]] std::string constexpr Canonicalize() const override final { + [[nodiscard]] std::string Canonicalize() const override final { if constexpr (std::is_enum_v<Type>) { return CanonicalizeEnum(this->GetValue()); } else { @@ -256,11 +256,11 @@ public: * @param runtime_modifiable_ Suggests whether this is modifiable while a guest is loaded * @param other_setting_ A second Setting to associate to this one in metadata */ + template <typename T = BasicSetting> explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const std::string& name, Category category_, u32 specialization_ = Specialization::Default, bool save_ = true, bool runtime_modifiable_ = false, - BasicSetting* other_setting_ = nullptr) - requires(!ranged) + typename std::enable_if<!ranged, T*>::type other_setting_ = nullptr) : Setting<Type, false>{ linkage, default_val, name, category_, specialization_, save_, runtime_modifiable_, other_setting_} { @@ -282,12 +282,12 @@ public: * @param runtime_modifiable_ Suggests whether this is modifiable while a guest is loaded * @param other_setting_ A second Setting to associate to this one in metadata */ + template <typename T = BasicSetting> explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const Type& min_val, const Type& max_val, const std::string& name, Category category_, u32 specialization_ = Specialization::Default, bool save_ = true, bool runtime_modifiable_ = false, - BasicSetting* other_setting_ = nullptr) - requires(ranged) + typename std::enable_if<ranged, T*>::type other_setting_ = nullptr) : Setting<Type, true>{linkage, default_val, min_val, max_val, name, category_, specialization_, save_, runtime_modifiable_, |