Move all private functions to use an anonymous namespace.

rmw_zenoh_cpp/src/detail/rmw_data_types.cpp

@@ -33,7 +33,9 @@
 #include "rmw_data_types.hpp"
 
 ///=============================================================================
-static size_t hash_gid(const uint8_t * gid)
+namespace
+{
+size_t hash_gid(const uint8_t * gid)
 {
   std::stringstream hash_str;
   hash_str << std::hex;
@@ -45,10 +47,11 @@ static size_t hash_gid(const uint8_t * gid)
 }
 
 ///=============================================================================
-static size_t hash_gid(const rmw_request_id_t & request_id)
+size_t hash_gid(const rmw_request_id_t & request_id)
 {
   return hash_gid(request_id.writer_guid);
 }
+}  // namespace
 
 ///=============================================================================
 size_t rmw_context_impl_s::get_next_entity_id()

rmw_zenoh_cpp/src/rmw_init.cpp

@@ -42,9 +42,10 @@ extern "C"
 // TODO(clalancette): Make this configurable, or get it from the configuration
 #define SHM_BUFFER_SIZE_MB 10
 
-static void graph_sub_data_handler(
-  const z_sample_t * sample,
-  void * data)
+namespace
+{
+void
+graph_sub_data_handler(const z_sample_t * sample, void * data)
 {
   static_cast<void>(data);
 
@@ -84,6 +85,7 @@ static void graph_sub_data_handler(
     );
   }
 }
+}  // namespace
 
 //==============================================================================
 /// Initialize the middleware with the given options, and yielding an context.

rmw_zenoh_cpp/src/rmw_qos.cpp

@@ -24,11 +24,13 @@
 
 extern "C"
 {
+namespace
+{
 ///=============================================================================
 // Copied from rmw_dds_common::qos.cpp.
 // Returns RMW_RET_OK if successful or no buffer was provided
 // Returns RMW_RET_ERROR if there as an error copying the message to the buffer
-static rmw_ret_t
+rmw_ret_t
 _append_to_buffer(char * buffer, size_t buffer_size, const char * format, ...)
 {
   // Only write if a buffer is provided
@@ -48,6 +50,7 @@ _append_to_buffer(char * buffer, size_t buffer_size, const char * format, ...)
   }
   return RMW_RET_OK;
 }
+}  // namespace
 
 ///=============================================================================
 rmw_ret_t

rmw_zenoh_cpp/src/rmw_zenoh.cpp

@@ -416,7 +416,10 @@ rmw_fini_publisher_allocation(
   return RMW_RET_UNSUPPORTED;
 }
 
-static void generate_random_gid(uint8_t gid[RMW_GID_STORAGE_SIZE])
+namespace
+{
+void
+generate_random_gid(uint8_t gid[RMW_GID_STORAGE_SIZE])
 {
   std::random_device dev;
   std::mt19937 rng(dev());
@@ -427,6 +430,7 @@ static void generate_random_gid(uint8_t gid[RMW_GID_STORAGE_SIZE])
     gid[i] = dist(rng);
   }
 }
+}  // namespace
 
 //==============================================================================
 /// Create a publisher and return a handle to that publisher.
@@ -839,8 +843,10 @@ rmw_return_loaned_message_from_publisher(
   return RMW_RET_UNSUPPORTED;
 }
 
-static z_owned_bytes_map_t create_map_and_set_sequence_num(
-  int64_t sequence_number, uint8_t gid[RMW_GID_STORAGE_SIZE])
+namespace
+{
+z_owned_bytes_map_t
+create_map_and_set_sequence_num(int64_t sequence_number, uint8_t gid[RMW_GID_STORAGE_SIZE])
 {
   z_owned_bytes_map_t map = z_bytes_map_new();
   if (!z_check(map)) {
@@ -880,6 +886,7 @@ static z_owned_bytes_map_t create_map_and_set_sequence_num(
 
   return map;
 }
+}  // namespace
 
 //==============================================================================
 /// Publish a ROS message.
@@ -1695,7 +1702,10 @@ rmw_subscription_get_content_filter(
   return RMW_RET_UNSUPPORTED;
 }
 
-static rmw_ret_t __rmw_take_one(
+namespace
+{
+rmw_ret_t
+__rmw_take_one(
   rmw_zenoh_cpp::rmw_subscription_data_t * sub_data,
   void * ros_message,
   rmw_message_info_t * message_info,
@@ -1740,6 +1750,7 @@ static rmw_ret_t __rmw_take_one(
 
   return RMW_RET_OK;
 }
+}  // namespace
 
 //==============================================================================
 /// Take an incoming ROS message.
@@ -1887,7 +1898,10 @@ rmw_take_sequence(
 }
 
 //==============================================================================
-static rmw_ret_t __rmw_take_serialized(
+namespace
+{
+rmw_ret_t
+__rmw_take_serialized(
   const rmw_subscription_t * subscription,
   rmw_serialized_message_t * serialized_message,
   bool * taken,
@@ -1948,6 +1962,7 @@ static rmw_ret_t __rmw_take_serialized(
 
   return RMW_RET_OK;
 }
+}  // namespace
 
 //==============================================================================
 /// Take an incoming ROS message as a byte stream.
@@ -3355,7 +3370,10 @@ rmw_destroy_wait_set(rmw_wait_set_t * wait_set)
   return RMW_RET_OK;
 }
 
-static bool check_and_attach_condition(
+namespace
+{
+bool
+check_and_attach_condition(
   const rmw_subscriptions_t * const subscriptions,
   const rmw_guard_conditions_t * const guard_conditions,
   const rmw_services_t * const services,
@@ -3439,6 +3457,7 @@ static bool check_and_attach_condition(
 
   return false;
 }
+}  // namespace
 
 //==============================================================================
 /// Waits on sets of different entities and returns when one is ready.