C++20 compatibility fixes

Signed-off-by: Guilherme Rodrigues <guilherme.rodrigues@ait.ac.at>
ros2 · Aug 30, 2023 · daf632c · daf632c
1 parent 43cf0be
commit daf632c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rclcpp/include/rclcpp/experimental/intra_process_manager.hpp b/rclcpp/include/rclcpp/experimental/intra_process_manager.hpp
@@ -489,7 +489,7 @@ class IntraProcessManager
       if constexpr (rclcpp::TypeAdapter<MessageT>::is_specialized::value) {
         ROSMessageTypeAllocator ros_message_alloc(allocator);
         auto ptr = ros_message_alloc.allocate(1);
-        ros_message_alloc.construct(ptr);
+        std::allocator_traits<ROSMessageTypeAllocator>::construct(ros_message_alloc, ptr);
         ROSMessageTypeDeleter deleter;
         allocator::set_allocator_for_deleter(&deleter, &allocator);
         rclcpp::TypeAdapter<MessageT>::convert_to_ros_message(*message, *ptr);

diff --git a/rclcpp/test/rclcpp/executors/test_executors.cpp b/rclcpp/test/rclcpp/executors/test_executors.cpp
@@ -643,7 +643,7 @@ TYPED_TEST(TestExecutors, testRaceConditionAddNode)
           if (should_cancel) {
             break;
           }
-          total += k * (i + 42);
+          total = total + k * (i + 42);
         }
       });
   }