Ignore zero-variadic-macro-arguments warnings from lttng-ust macros (#…

…126)

Signed-off-by: Christophe Bedard <[email protected]>

tracetools/include/tracetools/tp_call.h

@@ -37,6 +37,11 @@
 /// See RMW_GID_STORAGE_SIZE in rmw.
 #define TRACETOOLS_GID_STORAGE_SIZE 24u
 
+#ifdef __clang__
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+#endif
+
 TRACEPOINT_EVENT(
   TRACEPOINT_PROVIDER,
   rcl_init,
@@ -509,6 +514,10 @@ TRACEPOINT_EVENT(
   )
 )
 
+#ifdef __clang__
+# pragma clang diagnostic pop
+#endif
+
 #endif  // _TRACETOOLS__TP_CALL_H_
 
 #include <lttng/tracepoint-event.h>

tracetools/src/tracetools.c

@@ -35,7 +35,7 @@
 # define _CONDITIONAL_TP(...) ((void) (0))
 # define _CONDITIONAL_TP_ENABLED(...) false
 # define _CONDITIONAL_DO_TP(...) ((void) (0))
-#endif
+#endif  // TRACETOOLS_TRACEPOINTS_EXCLUDED
 
 #define TRACEPOINT_ARGS(...) __VA_ARGS__
 #define TRACEPOINT_PARAMS(...) __VA_ARGS__
@@ -77,6 +77,7 @@ bool ros_trace_compile_status()
 #endif
 }
 
+// Ignore unused-parameters warning when tracepoints are excluded
 #ifndef _WIN32
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Wunused-parameter"
@@ -85,6 +86,12 @@ bool ros_trace_compile_status()
 # pragma warning(disable: 4100)
 #endif
 
+// Ignore zero-variadic-macro-arguments clang warnings caused by lttng-ust macros
+#ifdef __clang__
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+#endif
+
 DEFINE_TRACEPOINT(
   rcl_init,
   TRACEPOINT_PARAMS(
@@ -417,6 +424,10 @@ DEFINE_TRACEPOINT(
   TRACEPOINT_ARGS(
     buffer))
 
+#ifdef __clang__
+# pragma clang diagnostic pop
+#endif
+
 #ifndef _WIN32
 # pragma GCC diagnostic pop
 #else