From 6647cfdb4c2418a8a0e3248933d695c1dea0b973 Mon Sep 17 00:00:00 2001 From: Steffen Larsen Date: Thu, 15 Sep 2022 23:28:51 +0100 Subject: [PATCH] [SYCL] Fix macro definition conflicting with MSVC (#6798) The _CONCAT macro is defined in MSVC headers so to avoid redefinition warnings this commit changes the naming in the PI mock plugin from _CONCAT to _PI_MOCK_PLUGIN_CONCAT. Signed-off-by: Larsen, Steffen --- sycl/unittests/helpers/PiMockPlugin.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sycl/unittests/helpers/PiMockPlugin.hpp b/sycl/unittests/helpers/PiMockPlugin.hpp index 38bc916039594..724cff3f13480 100644 --- a/sycl/unittests/helpers/PiMockPlugin.hpp +++ b/sycl/unittests/helpers/PiMockPlugin.hpp @@ -899,15 +899,15 @@ inline pi_result mock_piPluginGetLastError(char **message) { return PI_SUCCESS; } -#define _CONCAT(A, B) A##B -#define CONCAT(A, B) _CONCAT(A, B) +#define _PI_MOCK_PLUGIN_CONCAT(A, B) A##B +#define PI_MOCK_PLUGIN_CONCAT(A, B) _PI_MOCK_PLUGIN_CONCAT(A, B) inline pi_plugin::FunctionPointers getMockedFunctionPointers() { return { -#define _PI_API(api) CONCAT(mock_, api), +#define _PI_API(api) PI_MOCK_PLUGIN_CONCAT(mock_, api), #include }; } -#undef CONCAT -#undef _CONCAT +#undef PI_MOCK_PLUGIN_CONCAT +#undef _PI_MOCK_PLUGIN_CONCAT