commit 2e51362783a64cee0af771b026a91eda564e992d
author Georgios Pinitas <georgios.pinitas@arm.com> Wed Nov 11 10:54:52 2020 +0000
committer Georgios Pinitas <georgios.pinitas@arm.com> Thu Nov 12 10:35:13 2020 +0000
tree 53166bfed9f0dcc16ad76322f2a155f5b9f0ad90
parent 5f2fb59054aee2ec190d72accdb45f852caf4b87

COMPMID-3701: Avoid macro clashing

Prefix macros in Version.h with ARM_COMPUTE_ and undef if not needed.

Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: Ie9607f6655550519863be55ec34490f45ccfa55e
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4379
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Sang-Hoon Park <sang-hoon.park@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>

arm_compute/core/Version.h

diff --git a/arm_compute/core/Version.h b/arm_compute/core/Version.h
index 3a2c783..a4d3079 100644
--- a/arm_compute/core/Version.h
+++ b/arm_compute/core/Version.h
@@ -27,12 +27,12 @@
 #include <string>
 
 /* Macro utilities */
-#define STRINGIFY2(s) #s
-#define STRINGIFY(s) STRINGIFY2(s)
+#define ARM_COMPUTE_STRINGIFY2(s) #s
+#define ARM_COMPUTE_STRINGIFY(s) ARM_COMPUTE_STRINGIFY2(s)
 
-#define ARM_COMPUTE_VERSION_STR          \
-    STRINGIFY(ARM_COMPUTE_VERSION_MAJOR) \
-    "." STRINGIFY(ARM_COMPUTE_VERSION_MINOR) "." STRINGIFY(ARM_COMPUTE_VERSION_PATCH)
+#define ARM_COMPUTE_VERSION_STR                      \
+    ARM_COMPUTE_STRINGIFY(ARM_COMPUTE_VERSION_MAJOR) \
+    "." ARM_COMPUTE_STRINGIFY(ARM_COMPUTE_VERSION_MINOR) "." ARM_COMPUTE_STRINGIFY(ARM_COMPUTE_VERSION_PATCH)
 
 namespace arm_compute
 {
@@ -45,4 +45,7 @@
 std::string build_information();
 } // namespace arm_compute
 
+#undef ARM_COMPUTE_STRINGIFY
+#undef ARM_COMPUTE_STRINGIFY2
+
 #endif /* ARM_COMPUTE_LIBRARY_VERSION_H */