rename {c_}utilities to rcutils (#104)

ros2 · Apr 20, 2017 · 8939f0c · 8939f0c
1 parent e8ab7e3
commit 8939f0c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/rmw_fastrtps_cpp/CMakeLists.txt b/rmw_fastrtps_cpp/CMakeLists.txt
@@ -22,7 +22,7 @@ endif()
 
 find_package(ament_cmake REQUIRED)
 
-find_package(c_utilities REQUIRED)
+find_package(rcutils REQUIRED)
 
 find_package(fastrtps_cmake_module REQUIRED)
 find_package(fastcdr REQUIRED CONFIG)
@@ -49,7 +49,7 @@ target_link_libraries(rmw_fastrtps_cpp
   fastcdr fastrtps)
 
 ament_target_dependencies(rmw_fastrtps_cpp
-  "c_utilities"
+  "rcutils"
   "rosidl_typesupport_introspection_c"
   "rosidl_typesupport_introspection_cpp"
   "rmw"

diff --git a/rmw_fastrtps_cpp/package.xml b/rmw_fastrtps_cpp/package.xml
@@ -12,10 +12,10 @@
 
   <buildtool_export_depend>ament_cmake</buildtool_export_depend>
 
-  <build_depend>c_utilities</build_depend>
   <build_depend>fastcdr</build_depend>
   <build_depend>fastrtps</build_depend>
   <build_depend>fastrtps_cmake_module</build_depend>
+  <build_depend>rcutils</build_depend>
   <build_depend>rmw</build_depend>
   <build_depend>rosidl_generator_c</build_depend>
   <build_depend>rosidl_generator_cpp</build_depend>

diff --git a/rmw_fastrtps_cpp/src/functions.cpp b/rmw_fastrtps_cpp/src/functions.cpp
@@ -22,6 +22,7 @@
 #include <set>
 #include <string>
 
+#include "rcutils/types/string_array.h"
 #include "rmw/allocators.h"
 #include "rmw/rmw.h"
 #include "rmw/error_handling.h"
@@ -2408,7 +2409,7 @@ rmw_destroy_topic_names_and_types(
 rmw_ret_t
 rmw_get_node_names(
   const rmw_node_t * node,
-  utilities_string_array_t * node_names)
+  rcutils_string_array_t * node_names)
 {
   if (!node) {
     RMW_SET_ERROR_MSG("null node handle");