[JSON] Assign from OptionalType (#1631)

Co-authored-by: Pierre Wielders <[email protected]>
rdkcentral · Jun 7, 2024 · ac3238a · ac3238a
1 parent e0d062d
commit ac3238a
Showing 1 changed file with 55 additions and 0 deletions.
diff --git a/Source/core/JSON.h b/Source/core/JSON.h
@@ -532,6 +532,15 @@ namespace Core {
                 return (*this);
             }
 
+            NumberType<TYPE, SIGNED, BASETYPE>& operator=(const Core::OptionalType<TYPE>& RHS)
+            {
+                if (RHS.IsSet() == true) {
+                    operator=(RHS.Value());
+                }
+
+                return (*this);
+            }
+
             inline TYPE Default() const
             {
                 return _default;
@@ -1054,6 +1063,15 @@ namespace Core {
                 return (*this);
             }
 
+            FloatType<TYPE>& operator=(const Core::OptionalType<TYPE>& RHS)
+            {
+                if (RHS.IsSet() == true) {
+                    operator=(RHS.Value());
+                }
+
+                return (*this);
+            }
+
             inline TYPE Default() const
             {
                 return _default;
@@ -1347,6 +1365,15 @@ namespace Core {
                 return (*this);
             }
 
+            Boolean& operator=(const Core::OptionalType<bool>& RHS)
+            {
+                if (RHS.IsSet() == true) {
+                    operator=(RHS.Value());
+                }
+
+                return (*this);
+            }
+
             inline bool Value() const
             {
                 return ((_value & SetBit) != 0 ? (_value & ValueBit) != 0 : (_value & DefaultBit) != 0);
@@ -1582,6 +1609,15 @@ namespace Core {
                 return (*this);
             }
 
+            String& operator=(const Core::OptionalType<string>& RHS)
+            {
+                if (RHS.IsSet() == true) {
+                    operator=(RHS.Value());
+                }
+
+                return (*this);
+            }
+
             String& operator=(const char RHS[])
             {
                 Core::ToString(RHS, _value);
@@ -2630,6 +2666,15 @@ namespace Core {
                 return (*this);
             }
 
+            EnumType<ENUMERATE>& operator=(const Core::OptionalType<ENUMERATE>& RHS)
+            {
+                if (RHS.IsSet() == true) {
+                    operator=(RHS.Value());
+                }
+
+                return (*this);
+            }
+
             inline const ENUMERATE Default() const
             {
                 return (_default);
@@ -3243,6 +3288,16 @@ namespace Core {
                 return (*this);
             }
 
+            template<typename ENUM>
+            ArrayType<ELEMENT>& operator=(const Core::OptionalType<ENUM>& RHS)
+            {
+                if (RHS.IsSet() == true) {
+                    operator=(RHS.Value());
+                }
+
+                return (*this);
+            }
+
             template<typename ENUM, typename std::enable_if<std::is_same<ELEMENT, EnumType<ENUM>>::value, int>::type = 0>
             inline operator const ENUM() const
             {