Fix windows issues

Signed-off-by: Stephen Brawner <brawner@gmail.com>
ros2 · Sep 17, 2020 · 95462bf · 95462bf
1 parent 20b7fae
commit 95462bf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/rclcpp/test/rclcpp/wait_set_policies/test_static_storage.cpp b/rclcpp/test/rclcpp/wait_set_policies/test_static_storage.cpp
@@ -18,6 +18,7 @@
 
 #include "rclcpp/rclcpp.hpp"
 #include "rclcpp/wait_set.hpp"
+#include "rclcpp/wait_set_policies/static_storage.hpp"
 #include "../../utils/rclcpp_gtest_macros.hpp"
 
 #include "test_msgs/msg/empty.hpp"
@@ -126,7 +127,8 @@ TEST_F(TestStaticStorage, wait_subscription) {
   auto publisher = node->create_publisher<test_msgs::msg::Empty>("topic", 10);
   auto subscription = node->create_subscription<test_msgs::msg::Empty>(
     "topic", 10, [](test_msgs::msg::Empty::SharedPtr) {});
-  rclcpp::StaticWaitSet<1, 0, 0, 0, 0, 0> wait_set({{{subscription}}});
+  rclcpp::SubscriptionWaitSetMask mask{true, true, true};
+  rclcpp::StaticWaitSet<1, 0, 0, 0, 0, 0> wait_set({{{subscription, mask}}});
 
   {
     auto wait_result = wait_set.wait(std::chrono::milliseconds(10));

diff --git a/rclcpp/test/rclcpp/wait_set_policies/test_thread_safe_synchronization.cpp b/rclcpp/test/rclcpp/wait_set_policies/test_thread_safe_synchronization.cpp
@@ -160,7 +160,7 @@ TEST_F(TestThreadSafeStorage, add_remove_dynamically) {
     std::runtime_error("waitable already in use by another wait set"));
   wait_set.remove_waitable(waitable);
   wait_set.prune_deleted_entities();
-  
+
   // Expected behavior of thread-safe is to timeout here
   EXPECT_EQ(rclcpp::WaitResultKind::Timeout, wait_set.wait(std::chrono::milliseconds(10)).kind());
 }