aboutsummaryrefslogtreecommitdiff
path: root/src/common/settings_enums.h
diff options
context:
space:
mode:
authorlizzie <lizzie@eden-emu.dev>2025-10-17 22:12:58 +0200
committercrueter <crueter@eden-emu.dev>2025-10-17 22:12:58 +0200
commit3e8fe622a7d1dc8ff9d3a34d975b556b8fd35a94 (patch)
tree374efb4578d3d99aef4564b1d6e13973aa8e9ac3 /src/common/settings_enums.h
parent1c90b099d3eb7991462b82dae340c3f8743e1755 (diff)
[compat] Solaris build fixes for openssl, catch2; NetBSD build fixes (#2752)
Signed-off-by: lizzie <lizzie@eden-emu.dev> Co-authored-by: crueter <crueter@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2752 Reviewed-by: Shinmegumi <shinmegumi@eden-emu.dev> Reviewed-by: crueter <crueter@eden-emu.dev> Reviewed-by: MaranBr <maranbr@eden-emu.dev> Co-authored-by: lizzie <lizzie@eden-emu.dev> Co-committed-by: lizzie <lizzie@eden-emu.dev>
Diffstat (limited to 'src/common/settings_enums.h')
-rw-r--r--src/common/settings_enums.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h
index c8a5fc7bd9..3ba2144efc 100644
--- a/src/common/settings_enums.h
+++ b/src/common/settings_enums.h
@@ -21,8 +21,8 @@ template <typename T>
struct EnumMetadata {
static std::vector<std::pair<std::string_view, T>> Canonicalizations();
static u32 Index();
- static constexpr T GetFirst();
- static constexpr T GetLast();
+ static T GetFirst();
+ static T GetLast();
};
#define PAIR_45(N, X, ...) {#X, N::X} __VA_OPT__(, PAIR_46(N, __VA_ARGS__))
@@ -82,10 +82,10 @@ struct EnumMetadata {
template<> inline u32 EnumMetadata<NAME>::Index() { \
return __COUNTER__; \
} \
- template<> inline constexpr NAME EnumMetadata<NAME>::GetFirst() { \
+ template<> inline NAME EnumMetadata<NAME>::GetFirst() { \
return NAME::PP_HEAD(__VA_ARGS__); \
} \
- template<> inline constexpr NAME EnumMetadata<NAME>::GetLast() { \
+ template<> inline NAME EnumMetadata<NAME>::GetLast() { \
return (std::vector<std::pair<std::string_view, NAME>>{PAIR(NAME, __VA_ARGS__)}).back().second; \
}
@@ -106,17 +106,17 @@ inline u32 EnumMetadata<AudioEngine>::Index() {
return 100;
}
template<>
-inline constexpr AudioEngine EnumMetadata<AudioEngine>::GetFirst() {
+inline AudioEngine EnumMetadata<AudioEngine>::GetFirst() {
return AudioEngine::Auto;
}
template<>
-inline constexpr AudioEngine EnumMetadata<AudioEngine>::GetLast() {
+inline AudioEngine EnumMetadata<AudioEngine>::GetLast() {
return AudioEngine::Oboe;
}
ENUM(AudioMode, Mono, Stereo, Surround);
-static_assert(EnumMetadata<AudioMode>::GetFirst() == AudioMode::Mono);
-static_assert(EnumMetadata<AudioMode>::GetLast() == AudioMode::Surround);
+//static_assert(EnumMetadata<AudioMode>::GetFirst() == AudioMode::Mono);
+//static_assert(EnumMetadata<AudioMode>::GetLast() == AudioMode::Surround);
ENUM(Language, Japanese, EnglishAmerican, French, German, Italian, Spanish, Chinese, Korean, Dutch,
Portuguese, Russian, Taiwanese, EnglishBritish, FrenchCanadian, SpanishLatin,