Fix ChipError scope resolution

Make sure to unambiguously specify the chip namespace in macros as they can be evaluated in places where 'chip::' is ambiguous.
project-chip · Sep 13, 2021 · 9d2f571 · 9d2f571
1 parent e945d16
commit 9d2f571
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/lib/core/CHIPError.h b/src/lib/core/CHIPError.h
@@ -146,9 +146,10 @@ class ChipError
      * (In C++20 this could be replaced by a consteval constructor.)
      */
 #if CHIP_CONFIG_ERROR_SOURCE
-#define CHIP_SDK_ERROR(part, code) (::chip::ChipError(chip::ChipError::SdkErrorConstant<(part), (code)>::value, __FILE__, __LINE__))
+#define CHIP_SDK_ERROR(part, code)                                                                                                 \
+    (::chip::ChipError(::chip::ChipError::SdkErrorConstant<(part), (code)>::value, __FILE__, __LINE__))
 #else // CHIP_CONFIG_ERROR_SOURCE
-#define CHIP_SDK_ERROR(part, code) (::chip::ChipError(chip::ChipError::SdkErrorConstant<(part), (code)>::value))
+#define CHIP_SDK_ERROR(part, code) (::chip::ChipError(::chip::ChipError::SdkErrorConstant<(part), (code)>::value))
 #endif // CHIP_CONFIG_ERROR_SOURCE
 
     /**