From 2e51362783a64cee0af771b026a91eda564e992d Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Wed, 11 Nov 2020 10:54:52 +0000 Subject: COMPMID-3701: Avoid macro clashing Prefix macros in Version.h with ARM_COMPUTE_ and undef if not needed. Signed-off-by: Georgios Pinitas Change-Id: Ie9607f6655550519863be55ec34490f45ccfa55e Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4379 Tested-by: Arm Jenkins Reviewed-by: Sang-Hoon Park Comments-Addressed: Arm Jenkins --- arm_compute/core/Version.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/arm_compute/core/Version.h b/arm_compute/core/Version.h index 3a2c783223..a4d307950a 100644 --- a/arm_compute/core/Version.h +++ b/arm_compute/core/Version.h @@ -27,12 +27,12 @@ #include /* 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 @@ namespace arm_compute std::string build_information(); } // namespace arm_compute +#undef ARM_COMPUTE_STRINGIFY +#undef ARM_COMPUTE_STRINGIFY2 + #endif /* ARM_COMPUTE_LIBRARY_VERSION_H */ -- cgit v1.2.1