Skip to content

Commit ce42968

Browse files
authored
Fix enum naming for avoid collision (#242)
Signed-off-by: Pablo Garrido <[email protected]>
1 parent 9c844f1 commit ce42968

File tree

4 files changed

+120
-120
lines changed

4 files changed

+120
-120
lines changed

rclc/include/rclc/executor_handle.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,21 @@ extern "C"
3333
/// Enumeration for timer, subscription, guard conditions etc to be waited on.
3434
typedef enum
3535
{
36-
SUBSCRIPTION,
37-
SUBSCRIPTION_WITH_CONTEXT,
38-
TIMER,
39-
// TIMER_WITH_CONTEXT, // TODO
40-
CLIENT,
41-
CLIENT_WITH_REQUEST_ID,
42-
// CLIENT_WITH_CONTEXT, // TODO
43-
SERVICE,
44-
SERVICE_WITH_REQUEST_ID,
45-
SERVICE_WITH_CONTEXT,
46-
ACTION_CLIENT,
47-
ACTION_SERVER,
48-
GUARD_CONDITION,
49-
// GUARD_CONDITION_WITH_CONTEXT, //TODO
50-
NONE
36+
RCLC_SUBSCRIPTION,
37+
RCLC_SUBSCRIPTION_WITH_CONTEXT,
38+
RCLC_TIMER,
39+
// RCLC_TIMER_WITH_CONTEXT, // TODO
40+
RCLC_CLIENT,
41+
RCLC_CLIENT_WITH_REQUEST_ID,
42+
// RCLC_CLIENT_WITH_CONTEXT, // TODO
43+
RCLC_SERVICE,
44+
RCLC_SERVICE_WITH_REQUEST_ID,
45+
RCLC_SERVICE_WITH_CONTEXT,
46+
RCLC_ACTION_CLIENT,
47+
RCLC_ACTION_SERVER,
48+
RCLC_GUARD_CONDITION,
49+
// RCLC_GUARD_CONDITION_WITH_CONTEXT, //TODO
50+
RCLC_NONE
5151
} rclc_executor_handle_type_t;
5252

5353
/// Enumeration for invocation type. ON_NEW_DATA calls a callback only when new data is available

0 commit comments

Comments
 (0)