From a998d53d68e224235ad2fd171e28f2ac2c866bdf Mon Sep 17 00:00:00 2001 From: Anush Nadathur Date: Fri, 15 Mar 2024 09:55:20 -0700 Subject: [PATCH] Fixing namespace naming to be consistent --- src/darwin/Framework/CHIP/MTRBaseDevice.mm | 2 +- src/darwin/Framework/CHIP/MTRDeviceController.mm | 2 +- src/darwin/Framework/CHIP/MTRDeviceControllerDelegateBridge.mm | 2 +- src/darwin/Framework/CHIP/MTRMetricKeys.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/darwin/Framework/CHIP/MTRBaseDevice.mm b/src/darwin/Framework/CHIP/MTRBaseDevice.mm index c88252dd3b80e0..56a49f9859e288 100644 --- a/src/darwin/Framework/CHIP/MTRBaseDevice.mm +++ b/src/darwin/Framework/CHIP/MTRBaseDevice.mm @@ -62,7 +62,7 @@ using chip::Optional; using chip::SessionHandle; using chip::Messaging::ExchangeManager; -using namespace chip::Metrics::DarwinFramework; +using namespace chip::Tracing::DarwinFramework; NSString * const MTRAttributePathKey = @"attributePath"; NSString * const MTRCommandPathKey = @"commandPath"; diff --git a/src/darwin/Framework/CHIP/MTRDeviceController.mm b/src/darwin/Framework/CHIP/MTRDeviceController.mm index e09a8fd403ba0b..a5ce9f14968326 100644 --- a/src/darwin/Framework/CHIP/MTRDeviceController.mm +++ b/src/darwin/Framework/CHIP/MTRDeviceController.mm @@ -107,7 +107,7 @@ typedef id (^SyncWorkQueueBlockWithReturnValue)(void); typedef BOOL (^SyncWorkQueueBlockWithBoolReturnValue)(void); -using namespace chip::Metrics::DarwinFramework; +using namespace chip::Tracing::DarwinFramework; @implementation MTRDeviceController { // Atomic because it can be touched from multiple threads. diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerDelegateBridge.mm b/src/darwin/Framework/CHIP/MTRDeviceControllerDelegateBridge.mm index f271cfb4efdfd0..842f0019ae81b8 100644 --- a/src/darwin/Framework/CHIP/MTRDeviceControllerDelegateBridge.mm +++ b/src/darwin/Framework/CHIP/MTRDeviceControllerDelegateBridge.mm @@ -23,7 +23,7 @@ #import "MTRMetricKeys.h" #import "MTRMetricsCollector.h" -using namespace chip::Metrics::DarwinFramework; +using namespace chip::Tracing::DarwinFramework; MTRDeviceControllerDelegateBridge::MTRDeviceControllerDelegateBridge(void) : mDelegate(nil) diff --git a/src/darwin/Framework/CHIP/MTRMetricKeys.h b/src/darwin/Framework/CHIP/MTRMetricKeys.h index 86b40e4551c20b..6a76befdcd58ca 100644 --- a/src/darwin/Framework/CHIP/MTRMetricKeys.h +++ b/src/darwin/Framework/CHIP/MTRMetricKeys.h @@ -18,7 +18,7 @@ #include namespace chip { -namespace Metrics { +namespace Tracing { namespace DarwinFramework { constexpr Tracing::MetricKey kMetricDeviceCommissioning = "dwnfw_device_commissioning";