Change SIDE_ACCEPT_COMMA() to SIDE_EXPECT_SEMICOLLON()

Change-Id: I8762f6aca32418cc200bfa4f5a04b6159781fb5b
Signed-off-by: Olivier Dion <odion@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/side/instrumentation-c-api.h b/include/side/instrumentation-c-api.h
index 8c16a441b132348470381ba69358a12298bbc127..037335b8690c76918089d1d2a6e4d9f22fc600a0 100644 (file)
--- a/include/side/instrumentation-c-api.h
+++ b/include/side/instrumentation-c-api.h
@@ -1612,7 +1612,7 @@ enum {
        };                                                              \
        static const struct side_event_description __attribute__((section("side_event_description_ptr"), used)) \
        *side_event_ptr__##_identifier = &(_identifier);                \
-       SIDE_POP_DIAGNOSTIC() SIDE_ACCEPT_COMMA()
+       SIDE_POP_DIAGNOSTIC() SIDE_EXPECT_SEMICOLON()
 
 /*
  * In C++, it is not possible to forward declare a static variable.  Use

diff --git a/include/side/macros.h b/include/side/macros.h
index b0388d3ce862280a27d93fd7b2cc98a93a9de34b..d6eff0f99d0a4dea74f491aa86f8a2157d837cfb 100644 (file)
--- a/include/side/macros.h
+++ b/include/side/macros.h
@@ -27,8 +27,8 @@
 #define SIDE_CAT2_PRIMITIVE(x, y...) x ## y
 #define SIDE_CAT2(x, y...) SIDE_CAT2_PRIMITIVE(x, y)
 
-/* Accept a trailing comma. */
-#define SIDE_ACCEPT_COMMA(...) side_static_assert(1, "", _)
+/* Expect a trailing semicolon. */
+#define SIDE_EXPECT_SEMICOLON(...) side_static_assert(1, "", _)
 
 /*
  * The diagnostic macros can be used to turn-off warnings using inline _Pragma.