From 736e95c7ebd444631d28db91c79692ff81d0016f Mon Sep 17 00:00:00 2001
From: Johannes Plapp <johannes.plapp@logivations.com>
Date: Fri, 27 Sep 2024 15:37:35 +0200
Subject: [PATCH] fix merge

---
 .../temporary_directory_fixture.hpp             |  2 +-
 .../src/rosbag2_transport/recorder.cpp          | 17 ++++++++++-------
 .../test/rosbag2_transport/test_rewrite.cpp     |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/rosbag2_test_common/include/rosbag2_test_common/temporary_directory_fixture.hpp b/rosbag2_test_common/include/rosbag2_test_common/temporary_directory_fixture.hpp
index 7098e9286..fc0fc2ed8 100644
--- a/rosbag2_test_common/include/rosbag2_test_common/temporary_directory_fixture.hpp
+++ b/rosbag2_test_common/include/rosbag2_test_common/temporary_directory_fixture.hpp
@@ -31,7 +31,7 @@ class TemporaryDirectoryFixture : public Test
 public:
   TemporaryDirectoryFixture()
   {
-    temporary_dir_path_ = rcpputils::fs::create_temporary_directory("tmp_test_dir_").string();
+    temporary_dir_path_ = rcpputils::fs::create_temp_directory("tmp_test_dir_").string();
   }
 
   ~TemporaryDirectoryFixture() override
diff --git a/rosbag2_transport/src/rosbag2_transport/recorder.cpp b/rosbag2_transport/src/rosbag2_transport/recorder.cpp
index 81de88091..bea6706ef 100644
--- a/rosbag2_transport/src/rosbag2_transport/recorder.cpp
+++ b/rosbag2_transport/src/rosbag2_transport/recorder.cpp
@@ -665,15 +665,18 @@ RecorderImpl::create_subscription(
         topic_name, \
         qos, \
         [this, topic_name, topic_type, serializer](const MSG_TYPE::ConstSharedPtr message, const rclcpp::MessageInfo & mi) { \
-          rclcpp::SerializedMessage serialized_msg; \
-          serializer->serialize_message(message.get(), &serialized_msg); \
+          auto serialized_msg = std::make_shared<rclcpp::SerializedMessage>(); \
+          serializer->serialize_message(message.get(), serialized_msg.get()); \
           if (!paused_.load()) { \
-          writer_->write( \
-            std::move(serialized_msg), topic_name, topic_type, \
-            mi.get_rmw_message_info().received_timestamp, \
-            mi.get_rmw_message_info().source_timestamp); \
+            writer_->write( \
+              std::static_pointer_cast<const rclcpp::SerializedMessage>(serialized_msg), \
+              topic_name, \
+              topic_type, \
+              mi.get_rmw_message_info().received_timestamp, \
+              mi.get_rmw_message_info().source_timestamp \
+            ); \
           } \
-        }); \
+        });\
       return subscription; \
     }
   // List of all message types with their corresponding string representations
diff --git a/rosbag2_transport/test/rosbag2_transport/test_rewrite.cpp b/rosbag2_transport/test/rosbag2_transport/test_rewrite.cpp
index 36ed868d9..6cbf911fa 100644
--- a/rosbag2_transport/test/rosbag2_transport/test_rewrite.cpp
+++ b/rosbag2_transport/test/rosbag2_transport/test_rewrite.cpp
@@ -53,7 +53,7 @@ class TestRewrite : public Test, public WithParamInterface<std::string>
 public:
   TestRewrite()
   {
-    auto tmp_dir = rcpputils::fs::create_temporary_directory("test_bag_rewrite");
+    auto tmp_dir = rcpputils::fs::create_temp_directory("test_bag_rewrite");
     output_dir_ = fs::path(tmp_dir.string());
     storage_id_ = GetParam();
     bags_path_ = fs::path(_SRC_RESOURCES_DIR_PATH) / storage_id_;