Extend simgear::Optional with value_or

Needed to allow parity with C++17 use on next
2022-02-03 12:52:58 +00:00 · 2022-02-03 12:52:58 +00:00 · e5bef3f97f
commit e5bef3f97f
parent af0f7676c4
1 changed files with 16 additions and 0 deletions
--- a/simgear/misc/simgear_optional.hxx
+++ b/simgear/misc/simgear_optional.hxx
@ -74,6 +74,22 @@ public:
        return _value;
    }

+    const T& value_or(const T& defaultValue) const
+    {
+        if (!_haveValue) {
+            return defaultValue;
+        }
+        return _value;
+    }
+
+    T& value_or(T& defaultValue) const
+    {
+        if (!_haveValue) {
+            return defaultValue;
+        }
+        return _value;
+    }
+
    T& value()
    {
        if (!_haveValue) {