From 39bd9733211ee7c26b975d3a54a6b646595ed460 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Tue, 26 Aug 2025 23:17:04 +0200 Subject: [PATCH] Correctly define comparison operators --- apps/OpenSpace/ext/sgct | 2 +- include/openspace/engine/settings.h | 8 ++++---- include/openspace/scene/profile.h | 2 +- include/openspace/util/keys.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index f45ea2c797..22fee0db71 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit f45ea2c797bfa4e753b2acce0eab72c2f2f16300 +Subproject commit 22fee0db714734c7176aedb37fd2dc470e6316c2 diff --git a/include/openspace/engine/settings.h b/include/openspace/engine/settings.h index f0c514ee8b..e549fc57a0 100644 --- a/include/openspace/engine/settings.h +++ b/include/openspace/engine/settings.h @@ -33,8 +33,6 @@ namespace openspace { struct Settings { - auto operator<=>(const Settings&) const = default; - // Settings that are not configurable by the user and that represent a persistent // state for the system std::optional hasStartedBefore; @@ -50,12 +48,14 @@ struct Settings { std::optional layerServer; struct MRF { - auto operator<=>(const MRF&) const = default; - std::optional isEnabled; std::optional location; + + bool operator==(const MRF&) const noexcept = default; }; MRF mrf; + + bool operator==(const Settings&) const noexcept = default; }; std::filesystem::path findSettings(const std::string& filename = "settings.json"); diff --git a/include/openspace/scene/profile.h b/include/openspace/scene/profile.h index df2d79baf8..ebf3b2222f 100644 --- a/include/openspace/scene/profile.h +++ b/include/openspace/scene/profile.h @@ -97,7 +97,7 @@ public: bool isLocal = false; std::string script; - bool operator==(const Action&) const = default; + bool operator==(const Action&) const noexcept = default; }; struct Keybinding { diff --git a/include/openspace/util/keys.h b/include/openspace/util/keys.h index 45663351b0..b4a626f0cf 100644 --- a/include/openspace/util/keys.h +++ b/include/openspace/util/keys.h @@ -390,7 +390,7 @@ struct KeyWithModifier { Key key = Key::Unknown; KeyModifier modifier = KeyModifier::None; - auto operator<=>(const KeyWithModifier&) const = default; + auto operator<=>(const KeyWithModifier&) const noexcept = default; }; constexpr inline bool isKeypadKey(Key key) noexcept {