From 2562f715abe2a6878e3c44a23e33e6b9d2d633bd Mon Sep 17 00:00:00 2001
From: Chris Lalancette <clalancette@openrobotics.org>
Date: Tue, 30 Mar 2021 08:58:32 -0400
Subject: [PATCH] Revert "Namespace tracetools C++ functions (#1603)" (#1607)

This reverts commit 3ab65715933fda37be06f14d3d6522161a1f1928.

Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
---
 rclcpp/include/rclcpp/any_service_callback.hpp      | 4 ++--
 rclcpp/include/rclcpp/any_subscription_callback.hpp | 8 ++++----
 rclcpp/include/rclcpp/timer.hpp                     | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/rclcpp/include/rclcpp/any_service_callback.hpp b/rclcpp/include/rclcpp/any_service_callback.hpp
index 78c3ed0052..86d420860d 100644
--- 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
index 9a31ecff53..5a708435bd 100644
--- 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
index cc8e5c6ccd..a2662f4abe 100644
--- 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.