From 277d6128102c0fd99b2de0d612bf85aee6339377 Mon Sep 17 00:00:00 2001 From: Emerson Knapp Date: Mon, 29 Nov 2021 23:08:48 -0800 Subject: [PATCH] Don't dllexport stl containers, instead just the public interface Signed-off-by: Emerson Knapp --- rosbag2_transport/src/rosbag2_transport/topic_filter.cpp | 3 +++ rosbag2_transport/src/rosbag2_transport/topic_filter.hpp | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/rosbag2_transport/src/rosbag2_transport/topic_filter.cpp b/rosbag2_transport/src/rosbag2_transport/topic_filter.cpp index 010087128a..409fbb261e 100644 --- a/rosbag2_transport/src/rosbag2_transport/topic_filter.cpp +++ b/rosbag2_transport/src/rosbag2_transport/topic_filter.cpp @@ -79,6 +79,9 @@ TopicFilter::TopicFilter(RecordOptions record_options, bool allow_unknown_types) allow_unknown_types_(allow_unknown_types) {} +TopicFilter::~TopicFilter() +{} + std::unordered_map TopicFilter::filter_topics( const std::map> & topic_names_and_types) { diff --git a/rosbag2_transport/src/rosbag2_transport/topic_filter.hpp b/rosbag2_transport/src/rosbag2_transport/topic_filter.hpp index c04c867ed4..1ac339e30d 100644 --- a/rosbag2_transport/src/rosbag2_transport/topic_filter.hpp +++ b/rosbag2_transport/src/rosbag2_transport/topic_filter.hpp @@ -27,11 +27,14 @@ namespace rosbag2_transport { -class ROSBAG2_TRANSPORT_PUBLIC TopicFilter +class TopicFilter { public: + ROSBAG2_TRANSPORT_PUBLIC explicit TopicFilter(RecordOptions record_options, bool allow_unknown_types = false); - virtual ~TopicFilter() {} + + ROSBAG2_TRANSPORT_PUBLIC + virtual ~TopicFilter(); /// Filter all topic_names_and_types via take_topic method, return the resulting filtered set /// Filtering order is: @@ -39,6 +42,7 @@ class ROSBAG2_TRANSPORT_PUBLIC TopicFilter /// - topics list /// - exclude regex /// - include regex OR "all" + ROSBAG2_TRANSPORT_PUBLIC std::unordered_map filter_topics( const std::map> & topic_names_and_types);