From be891f1ca5c8f5766dc07c06b0dda211f085e1a3 Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Wed, 21 Nov 2018 16:12:47 -0800 Subject: [PATCH] unique macro name --- rosidl_generator_cpp/resource/msg__struct.hpp.em | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rosidl_generator_cpp/resource/msg__struct.hpp.em b/rosidl_generator_cpp/resource/msg__struct.hpp.em index 8237f4e6c..a304ed78b 100644 --- a/rosidl_generator_cpp/resource/msg__struct.hpp.em +++ b/rosidl_generator_cpp/resource/msg__struct.hpp.em @@ -68,7 +68,7 @@ for member in message.structure.members: @{ deprecated_macro_name = \ - '__'.join(['DEPRECATED', package_name] + list(interface_path.parents[0].parts) + [interface_path.stem]) + '__'.join(['DEPRECATED', package_name] + list(interface_path.parents[0].parts) + [message.structure.type.name]) }@ #ifndef _WIN32 # define @(deprecated_macro_name) __attribute__((deprecated))