From f2fea4247fdcfa85ae4e8a3e95400c085aa83399 Mon Sep 17 00:00:00 2001 From: Emerson Knapp Date: Mon, 13 Apr 2020 18:22:55 -0700 Subject: [PATCH] Make converter_factory_ private Signed-off-by: Emerson Knapp --- rosbag2_cpp/include/rosbag2_cpp/readers/sequential_reader.hpp | 4 +++- rosbag2_cpp/src/rosbag2_cpp/readers/sequential_reader.cpp | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rosbag2_cpp/include/rosbag2_cpp/readers/sequential_reader.hpp b/rosbag2_cpp/include/rosbag2_cpp/readers/sequential_reader.hpp index b99d89a85a..4010fccfea 100644 --- a/rosbag2_cpp/include/rosbag2_cpp/readers/sequential_reader.hpp +++ b/rosbag2_cpp/include/rosbag2_cpp/readers/sequential_reader.hpp @@ -126,13 +126,15 @@ class ROSBAG2_CPP_PUBLIC SequentialReader const std::string & storage_serialization_format); std::unique_ptr storage_factory_{}; - std::shared_ptr converter_factory_{}; std::shared_ptr storage_{}; std::unique_ptr converter_{}; std::unique_ptr metadata_io_{}; rosbag2_storage::BagMetadata metadata_{}; std::vector file_paths_{}; // List of database files. std::vector::iterator current_file_iterator_{}; // Index of file to read from + +private: + std::shared_ptr converter_factory_{}; }; } // namespace readers diff --git a/rosbag2_cpp/src/rosbag2_cpp/readers/sequential_reader.cpp b/rosbag2_cpp/src/rosbag2_cpp/readers/sequential_reader.cpp index 18740e5d39..6e43017e1b 100644 --- a/rosbag2_cpp/src/rosbag2_cpp/readers/sequential_reader.cpp +++ b/rosbag2_cpp/src/rosbag2_cpp/readers/sequential_reader.cpp @@ -61,9 +61,9 @@ SequentialReader::SequentialReader( std::shared_ptr converter_factory, std::unique_ptr metadata_io) : storage_factory_(std::move(storage_factory)), - converter_factory_(std::move(converter_factory)), converter_(nullptr), - metadata_io_(std::move(metadata_io)) + metadata_io_(std::move(metadata_io)), + converter_factory_(std::move(converter_factory)) {} SequentialReader::~SequentialReader()