Remove MTR_HIDDEN to avoid duplicate visibility attributes

project-chip · Jan 23, 2024 · 2e4c97d · 2e4c97d
1 parent 82943d1
commit 2e4c97d
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 17 deletions.
diff --git a/src/darwin/Framework/CHIP/MTRBaseDevice.mm b/src/darwin/Framework/CHIP/MTRBaseDevice.mm
@@ -90,7 +90,6 @@
 
 class MTRDataValueDictionaryCallbackBridge;
 
-MTR_HIDDEN
 @interface MTRReadClientContainer : NSObject
 @property (nonatomic, readwrite) app::ReadClient * readClientPtr;
 @property (nonatomic, readwrite) app::AttributePathParams * pathParams;

diff --git a/src/darwin/Framework/CHIP/MTRDefines.h b/src/darwin/Framework/CHIP/MTRDefines.h
@@ -50,8 +50,6 @@
 
 #define MTR_EXPORT __attribute__((visibility("default")))
 
-#define MTR_HIDDEN __attribute__((visibility("hidden")))
-
 #ifdef __cplusplus
 #define MTR_EXTERN extern "C" MTR_EXPORT
 #else

diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerParameters.h b/src/darwin/Framework/CHIP/MTRDeviceControllerParameters.h
@@ -33,9 +33,6 @@ NS_ASSUME_NONNULL_BEGIN
  * interfaces inheriting from this one should be used to actually do the
  * initialization.
  */
-#if !MTR_PER_CONTROLLER_STORAGE_ENABLED
-MTR_HIDDEN
-#endif
 MTR_NEWLY_AVAILABLE
 @interface MTRDeviceControllerAbstractParameters : NSObject
 - (instancetype)init NS_UNAVAILABLE;
@@ -46,9 +43,6 @@ MTR_NEWLY_AVAILABLE
  * Parameters that can be used to initialize an MTRDeviceController which
  * has a node identity.
  */
-#if !MTR_PER_CONTROLLER_STORAGE_ENABLED
-MTR_HIDDEN
-#endif
 MTR_NEWLY_AVAILABLE
 @interface MTRDeviceControllerParameters : MTRDeviceControllerAbstractParameters
 
@@ -92,9 +86,6 @@ MTR_NEWLY_AVAILABLE
 
 @end
 
-#if !MTR_PER_CONTROLLER_STORAGE_ENABLED
-MTR_HIDDEN
-#endif
 MTR_NEWLY_AVAILABLE
 @interface MTRDeviceControllerExternalCertificateParameters : MTRDeviceControllerParameters
 

diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerStorageDelegate.h b/src/darwin/Framework/CHIP/MTRDeviceControllerStorageDelegate.h
@@ -112,11 +112,6 @@ MTR_NEWLY_AVAILABLE
 @end
 
 // TODO: FIXME: Is this a sane place to put this API?
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
-MTR_EXTERN
-#else
-MTR_HIDDEN
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
 MTR_NEWLY_AVAILABLE NSSet<Class> * MTRDeviceControllerStorageClasses(void);
 
 NS_ASSUME_NONNULL_END