Fix build errors

Author: Michail-Antropov

examples/energy-management-app/energy-management-common/src/MeterIdentificationDelegate.cpp

@@ -29,6 +29,10 @@ using namespace chip::app::Clusters::MeterIdentification;
 using namespace chip::app::Clusters::MeterIdentification::Attributes;
 using namespace chip::app::Clusters::MeterIdentification::Structs;
 
+using chip::app::Clusters::MeterIdentification::MeterTypeEnum;
+using chip::app::Clusters::MeterIdentification::PowerThresholdSourceEnum;
+
+
 CHIP_ERROR MeterIdentificationInstance::Init()
 {
     return Instance::Init();
@@ -97,20 +101,6 @@ CHIP_ERROR MeterIdentificationDelegate::SetPointOfDelivery(CharSpan &newValue)
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR MeterIdentificationDelegate::SetPointOfDelivery(CharSpan &newValue)
-{
-    CharSpan oldValue = mPointOfDelivery;
-
-    mPointOfDelivery = newValue;
-    if (oldValue != newValue)
-    {
-        // We won't log raw values since these could change frequently
-        MatterReportingAttributeChangeCallback(mEndpointId, MeterIdentification::Id, PointOfDelivery::Id);
-    }
-
-    return CHIP_NO_ERROR;
-}
-
 CHIP_ERROR MeterIdentificationDelegate::SetPowerThreshold(DataModel::Nullable<uint64_t> newValue)
 {
     DataModel::Nullable<uint64_t> oldValue = mPowerThreshold;

src/app/clusters/meter-identification-server/meter-identification-server.cpp

@@ -35,7 +35,10 @@ using namespace chip::app::Clusters::MeterIdentification::Structs;
 
 using chip::Protocols::InteractionModel::Status;
 
-namespace chip::app::Clusters::MeterIdentification {
+namespace chip {
+namespace app {
+namespace Clusters {
+namespace MeterIdentification {
 
 CHIP_ERROR Instance::Init()
 {
@@ -112,4 +115,7 @@ CHIP_ERROR Instance::Write(const ConcreteReadAttributePath & aPath, AttributeVal
     return CHIP_NO_ERROR;
 }
 
-} // namespace chip::app::Clusters::MeterIdentification
+} // namespace MeterIdentification
+} // namespace Clusters
+} // namespace app
+} // namespace chip

src/app/clusters/meter-identification-server/meter-identification-server.h

@@ -19,12 +19,21 @@
 
 #include <stddef.h>
 
+#include <lib/core/Optional.h>
+
 #include <app-common/zap-generated/cluster-enums.h>
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/util/basic-types.h>
 #include <lib/core/CHIPError.h>
 
-namespace chip::app::Clusters::MeterIdentification {
+using chip::app::Clusters::MeterIdentification::MeterTypeEnum;
+using chip::app::Clusters::MeterIdentification::PowerThresholdSourceEnum;
+using Feature = chip::app::Clusters::MeterIdentification::Feature;
+
+namespace chip {
+namespace app {
+namespace Clusters {
+namespace MeterIdentification {
 
 struct Delegate
 {
@@ -72,4 +81,7 @@ class Instance : public AttributeAccessInterface
     CHIP_ERROR Write(const ConcreteDataAttributePath & aPath, AttributeValueDecoder & aDecoder) override;
 };
 
-} // namespace chip::app::Clusters::MeterIdentification
+} // namespace MeterIdentification
+} // namespace Clusters
+} // namespace app
+} // namespace chip