added prefix RCLC_

Signed-off-by: Jan Staschulat <[email protected]>
ros2 · Jun 27, 2023 · c3fddcc · c3fddcc
1 parent 6bb24e0
commit c3fddcc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/rclc/include/rclc/executor.h b/rclc/include/rclc/executor.h
@@ -54,19 +54,19 @@ extern "C"
 */
 typedef enum
 {
-  SEMANTICS_RCLCPP_EXECUTOR,
-  SEMANTICS_LOGICAL_EXECUTION_TIME
+  RCLC_SEMANTICS_RCLCPP_EXECUTOR,
+  RCLC_SEMANTICS_LOGICAL_EXECUTION_TIME
 } rclc_executor_semantics_t;
 
 /**
  * Different types of Executors.
 */
 typedef enum
 {
-  EXECUTOR_NOT_INITIALIZED,
-  EXECUTOR_SINGLE_THREADED,
-  EXECUTOR_MULTI_THREADED,
-  EXECUTOR_NON_POSIX,
+  RCLC_EXECUTOR_NOT_INITIALIZED,
+  RCLC_EXECUTOR_SINGLE_THREADED,
+  RCLC_EXECUTOR_MULTI_THREADED,
+  RCLC_EXECUTOR_NON_POSIX,
 } rclc_executor_type_t;
 
 /// Type definition for trigger function. With the parameters:

diff --git a/rclc/src/rclc/executor.c b/rclc/src/rclc/executor.c
@@ -141,7 +141,7 @@ rclc_executor_init(
   rclc_executor_set_trigger(executor, rclc_executor_trigger_any, NULL);
 
   // default semantics
-  rclc_executor_set_semantics(executor, SEMANTICS_RCLCPP_EXECUTOR);
+  rclc_executor_set_semantics(executor, RCLC_SEMANTICS_RCLCPP_EXECUTOR);
 
   return ret;
 }
@@ -1956,10 +1956,10 @@ rclc_executor_spin_some(rclc_executor_t * executor, const uint64_t timeout_ns)
 
   // based on semantics process input data
   switch (executor->data_comm_semantics) {
-    case SEMANTICS_LOGICAL_EXECUTION_TIME:
+    case RCLC_SEMANTICS_LOGICAL_EXECUTION_TIME:
       rc = _rclc_let_scheduling(executor);
       break;
-    case SEMANTICS_RCLCPP_EXECUTOR:
+    case RCLC_SEMANTICS_RCLCPP_EXECUTOR:
       rc = _rclc_default_scheduling(executor);
       break;
     default:

diff --git a/rclc/test/rclc/test_executor.cpp b/rclc/test/rclc/test_executor.cpp
@@ -1903,7 +1903,7 @@ TEST_F(TestDefaultExecutor, semantics_RCLCPP) {
   _pub_int_ptr = &this->pub1;
   _pub_int_msg_ptr = &this->pub1_msg;
   // ------------------------- test case setup ------------------------
-  rclc_executor_set_semantics(&executor, SEMANTICS_RCLCPP_EXECUTOR);
+  rclc_executor_set_semantics(&executor, RCLC_SEMANTICS_RCLCPP_EXECUTOR);
   this->pub1_msg.data = 1;
   _cb5_int_value = 0;  // received value in subscription2
   rc = rcl_publish(&this->pub1, &this->pub1_msg, nullptr);