Revert "Namespace tracetools C++ functions (#1603)"

This reverts commit 3ab6571. Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
ros2 · Mar 30, 2021 · 8851bc0 · 8851bc0
1 parent 3ab6571
commit 8851bc0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/rclcpp/include/rclcpp/any_service_callback.hpp b/rclcpp/include/rclcpp/any_service_callback.hpp
@@ -107,12 +107,12 @@ class AnyServiceCallback
       TRACEPOINT(
         rclcpp_callback_register,
         static_cast<const void *>(this),
-        tracetools::get_symbol(shared_ptr_callback_));
+        get_symbol(shared_ptr_callback_));
     } else if (shared_ptr_with_request_header_callback_) {
       TRACEPOINT(
         rclcpp_callback_register,
         static_cast<const void *>(this),
-        tracetools::get_symbol(shared_ptr_with_request_header_callback_));
+        get_symbol(shared_ptr_with_request_header_callback_));
     }
 #endif  // TRACETOOLS_DISABLED
   }

diff --git a/rclcpp/include/rclcpp/any_subscription_callback.hpp b/rclcpp/include/rclcpp/any_subscription_callback.hpp
@@ -243,22 +243,22 @@ class AnySubscriptionCallback
       TRACEPOINT(
         rclcpp_callback_register,
         static_cast<const void *>(this),
-        tracetools::get_symbol(shared_ptr_callback_));
+        get_symbol(shared_ptr_callback_));
     } else if (shared_ptr_with_info_callback_) {
       TRACEPOINT(
         rclcpp_callback_register,
         static_cast<const void *>(this),
-        tracetools::get_symbol(shared_ptr_with_info_callback_));
+        get_symbol(shared_ptr_with_info_callback_));
     } else if (unique_ptr_callback_) {
       TRACEPOINT(
         rclcpp_callback_register,
         static_cast<const void *>(this),
-        tracetools::get_symbol(unique_ptr_callback_));
+        get_symbol(unique_ptr_callback_));
     } else if (unique_ptr_with_info_callback_) {
       TRACEPOINT(
         rclcpp_callback_register,
         static_cast<const void *>(this),
-        tracetools::get_symbol(unique_ptr_with_info_callback_));
+        get_symbol(unique_ptr_with_info_callback_));
     }
 #endif  // TRACETOOLS_DISABLED
   }

diff --git a/rclcpp/include/rclcpp/timer.hpp b/rclcpp/include/rclcpp/timer.hpp
@@ -181,7 +181,7 @@ class GenericTimer : public TimerBase
     TRACEPOINT(
       rclcpp_callback_register,
       static_cast<const void *>(&callback_),
-      tracetools::get_symbol(callback_));
+      get_symbol(callback_));
   }
 
   /// Default destructor.