Overriding the = operation to always do a copy

cliffamzn · Jul 26, 2023 · cc9622a · cc9622a
1 parent 64b5316
commit cc9622a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/...resource-monitoring-app/resource-monitoring-common/src/instances/HepafilterMonitoring.cpp b/...resource-monitoring-app/resource-monitoring-common/src/instances/HepafilterMonitoring.cpp
@@ -34,14 +34,14 @@ using namespace chip::app::Clusters::ResourceMonitoring;
 using namespace chip::app::Clusters::ResourceMonitoring::Attributes;
 using chip::Protocols::InteractionModel::Status;
 
-ImmutableReplacementProductListManager hepaFilterReplacementProductListManager;
+static ImmutableReplacementProductListManager sHepaFilterReplacementProductListManager;
 
 //-- Hepa filter Monitoring instance methods
 CHIP_ERROR HepaFilterMonitoringInstance::AppInit()
 {
     ChipLogDetail(Zcl, "HepaFilterMonitoringInstance::Init()");
 
-    SetReplacementProductListManagerInstance(&hepaFilterReplacementProductListManager);
+    SetReplacementProductListManagerInstance(&sHepaFilterReplacementProductListManager);
 
     return CHIP_NO_ERROR;
 }

diff --git a/src/app/clusters/resource-monitoring-server/resource-monitoring-cluster-objects.h b/src/app/clusters/resource-monitoring-server/resource-monitoring-cluster-objects.h
@@ -98,6 +98,13 @@ struct ReplacementProductStruct : private HepaFilterMonitoring::Structs::Replace
         SetProductIdentifierValue(aProductIdentifierValue);
     }
 
+    ReplacementProductStruct & operator=(const ReplacementProductStruct & aReplacementProductStruct) 
+    {
+        SetProductIdentifierType(aReplacementProductStruct.GetProductIdentifierType());
+        SetProductIdentifierValue(aReplacementProductStruct.GetProductIdentifierValue());
+        return *this;
+    }
+
     using HepaFilterMonitoring::Structs::ReplacementProductStruct::Type::Encode;
 
     /**
@@ -130,8 +137,8 @@ struct ReplacementProductStruct : private HepaFilterMonitoring::Structs::Replace
         return CHIP_NO_ERROR;
     }
 
-    ProductIdentifierTypeEnum GetProductIdentifierType() { return static_cast<ProductIdentifierTypeEnum>(productIdentifierType); };
-    chip::CharSpan GetProductIdentifierValue() { return productIdentifierValue; };
+    ProductIdentifierTypeEnum GetProductIdentifierType() const { return static_cast<ProductIdentifierTypeEnum>(productIdentifierType); };
+    chip::CharSpan GetProductIdentifierValue() const { return productIdentifierValue; };
 };
 
 namespace Attributes {