Fix error from rebase action

Signed-off-by: Barry Xu <[email protected]>
ros2 · Sep 22, 2023 · 2cea90d · 2cea90d
1 parent 48fee06
commit 2cea90d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/rosbag2_transport/src/rosbag2_transport/player.cpp b/rosbag2_transport/src/rosbag2_transport/player.cpp
@@ -189,9 +189,9 @@ class PlayerImpl
   /// \return Hashtable representing topic to publisher map excluding inner clock_publisher
   std::unordered_map<std::string, std::shared_ptr<rclcpp::GenericPublisher>> get_publishers();
 
-  /// \brief Getter for clients corresponding to services 
+  /// \brief Getter for clients corresponding to services
   /// \return Hashtable representing service name to client map
-  std::unordered_map<std::string, std::shared_ptr<rclcpp::GenericPublisher>> get_clients();
+  std::unordered_map<std::string, std::shared_ptr<rclcpp::GenericClient>> get_clients();
 
   /// \brief Getter for inner clock_publisher
   /// \return Shared pointer to the inner clock_publisher
@@ -763,7 +763,7 @@ std::unordered_map<std::string,
   for (const auto & [topic, sender] : senders_) {
     if (std::holds_alternative<SharedPlayerPublisher>(sender)) {
       topic_to_publisher_map[topic] =
-      std::get<SharedPlayerPublisher>(sender)->generic_publisher();
+        std::get<SharedPlayerPublisher>(sender)->generic_publisher();
     }
   }
   return topic_to_publisher_map;
@@ -776,7 +776,7 @@ std::unordered_map<std::string,
   for (const auto & [service_name, sender] : senders_) {
     if (std::holds_alternative<SharedPlayerClient>(sender)) {
       topic_to_client_map[service_name] =
-      std::get<SharedPlayerClient>(sender)->generic_client();
+        std::get<SharedPlayerClient>(sender)->generic_client();
     }
   }
   return topic_to_client_map;
@@ -1432,7 +1432,7 @@ std::unordered_map<std::string, std::shared_ptr<rclcpp::GenericPublisher>> Playe
   return pimpl_->get_publishers();
 }
 
-std::unordered_map<std::string, std::shared_ptr<rclcpp::GenericPublisher>> Player::get_clients()
+std::unordered_map<std::string, std::shared_ptr<rclcpp::GenericClient>> Player::get_clients()
 {
   return pimpl_->get_clients();
 }

diff --git a/rosbag2_transport/test/rosbag2_transport/mock_player.hpp b/rosbag2_transport/test/rosbag2_transport/mock_player.hpp
@@ -52,9 +52,9 @@ class MockPlayer : public rosbag2_transport::Player
   {
     std::vector<rclcpp::ClientBase *> cli_list;
     for (const auto & client : get_clients()) {
-        cli_list.push_back(
-          static_cast<rclcpp::ClientBase *>(
-            client.second.get()));
+      cli_list.push_back(
+        static_cast<rclcpp::ClientBase *>(
+          client.second.get()));
     }
 
     return cli_list;