From 0e2252ebd45cdd48e9570fdf9ebc5b221eb304f1 Mon Sep 17 00:00:00 2001
From: Martin Idel <external.Martin.Idel@bosch-si.com>
Date: Thu, 6 Dec 2018 10:24:40 +0100
Subject: [PATCH] GH-14 Reflect renames of converter interfaces

---
 rosbag2_bag_v2_plugins/converter_plugin_description.xml      | 2 +-
 .../converter/rosbag_v2_deserializer.cpp                     | 4 ++--
 .../converter/rosbag_v2_deserializer.hpp                     | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/rosbag2_bag_v2_plugins/converter_plugin_description.xml b/rosbag2_bag_v2_plugins/converter_plugin_description.xml
index 93615817fa..47b3785a06 100644
--- a/rosbag2_bag_v2_plugins/converter_plugin_description.xml
+++ b/rosbag2_bag_v2_plugins/converter_plugin_description.xml
@@ -2,7 +2,7 @@
     <class
             name="rosbag_v2_converter"
             type="rosbag2_bag_v2_plugins::RosbagV2Deserializer"
-            base_class_type="rosbag2::converter_interfaces::SerializationFormatDeserializerInterface"
+            base_class_type="rosbag2::converter_interfaces::SerializationFormatDeserializer"
     >
         <description>
             This is a deserializer plugin which allows to convert ROS 1 messages via the
diff --git a/rosbag2_bag_v2_plugins/src/rosbag2_bag_v2_plugins/converter/rosbag_v2_deserializer.cpp b/rosbag2_bag_v2_plugins/src/rosbag2_bag_v2_plugins/converter/rosbag_v2_deserializer.cpp
index 5f47785519..8cebd5def3 100644
--- a/rosbag2_bag_v2_plugins/src/rosbag2_bag_v2_plugins/converter/rosbag_v2_deserializer.cpp
+++ b/rosbag2_bag_v2_plugins/src/rosbag2_bag_v2_plugins/converter/rosbag_v2_deserializer.cpp
@@ -19,7 +19,7 @@
 
 #include "rosbag/message_instance.h"
 
-#include "rosbag2/converter_interfaces/serialization_format_deserializer_interface.hpp"
+#include "rosbag2/converter_interfaces/serialization_format_deserializer.hpp"
 #include "rosbag2/types/introspection_message.hpp"
 #include "../convert_rosbag_message.hpp"
 
@@ -53,4 +53,4 @@ void RosbagV2Deserializer::deserialize(
 
 #include "pluginlib/class_list_macros.hpp"  // NOLINT
 PLUGINLIB_EXPORT_CLASS(rosbag2_bag_v2_plugins::RosbagV2Deserializer,
-  rosbag2::converter_interfaces::SerializationFormatDeserializerInterface)
+  rosbag2::converter_interfaces::SerializationFormatDeserializer)
diff --git a/rosbag2_bag_v2_plugins/src/rosbag2_bag_v2_plugins/converter/rosbag_v2_deserializer.hpp b/rosbag2_bag_v2_plugins/src/rosbag2_bag_v2_plugins/converter/rosbag_v2_deserializer.hpp
index fdbdc0013a..8f5b41737b 100644
--- a/rosbag2_bag_v2_plugins/src/rosbag2_bag_v2_plugins/converter/rosbag_v2_deserializer.hpp
+++ b/rosbag2_bag_v2_plugins/src/rosbag2_bag_v2_plugins/converter/rosbag_v2_deserializer.hpp
@@ -17,14 +17,13 @@
 
 #include <memory>
 
-#include "rosbag2/converter_interfaces/serialization_format_deserializer_interface.hpp"
+#include "rosbag2/converter_interfaces/serialization_format_deserializer.hpp"
 #include "rosbag2/types.hpp"
 #include "rosbag2/types/introspection_message.hpp"
 
 namespace rosbag2_bag_v2_plugins
 {
-class RosbagV2Deserializer : public
-  rosbag2::converter_interfaces::SerializationFormatDeserializerInterface
+class RosbagV2Deserializer : public rosbag2::converter_interfaces::SerializationFormatDeserializer
 {
 public:
   RosbagV2Deserializer() = default;