From 6ba0f59fed79c3fe669aac9dbe419a0e029cec6d Mon Sep 17 00:00:00 2001 From: Zachary Michaels Date: Fri, 6 Dec 2019 11:25:58 -0800 Subject: [PATCH] Fix asserts on shared_ptr::use_count; expects long, got uint32 (#936) * Fix asserts on shared_ptr::use_count; expects long, got uint32 Signed-off-by: Zachary Michaels * Add suffix to integer literals to make them longs Signed-off-by: Zachary Michaels * Add missing L Signed-off-by: Zachary Michaels --- rclcpp/test/test_intra_process_buffer.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rclcpp/test/test_intra_process_buffer.cpp b/rclcpp/test/test_intra_process_buffer.cpp index 87d2bae..16c457c 100644 --- a/rclcpp/test/test_intra_process_buffer.cpp +++ b/rclcpp/test/test_intra_process_buffer.cpp @@ -73,7 +73,7 @@ TEST(TestIntraProcessBuffer, shared_buffer_add) { intra_process_buffer.add_shared(original_shared_msg); - EXPECT_EQ(2u, original_shared_msg.use_count()); + EXPECT_EQ(2L, original_shared_msg.use_count()); SharedMessageT popped_shared_msg; popped_shared_msg = intra_process_buffer.consume_shared(); @@ -92,7 +92,7 @@ TEST(TestIntraProcessBuffer, shared_buffer_add) { popped_shared_msg = intra_process_buffer.consume_shared(); popped_message_pointer = reinterpret_cast(popped_shared_msg.get()); - EXPECT_EQ(1u, popped_shared_msg.use_count()); + EXPECT_EQ(1L, popped_shared_msg.use_count()); EXPECT_EQ(original_value, *popped_shared_msg); EXPECT_EQ(original_message_pointer, popped_message_pointer); } @@ -121,7 +121,7 @@ TEST(TestIntraProcessBuffer, unique_buffer_add) { intra_process_buffer.add_shared(original_shared_msg); - EXPECT_EQ(1u, original_shared_msg.use_count()); + EXPECT_EQ(1L, original_shared_msg.use_count()); UniqueMessageT popped_unique_msg; popped_unique_msg = intra_process_buffer.consume_unique(); @@ -168,7 +168,7 @@ TEST(TestIntraProcessBuffer, shared_buffer_consume) { intra_process_buffer.add_shared(original_shared_msg); - EXPECT_EQ(2u, original_shared_msg.use_count()); + EXPECT_EQ(2L, original_shared_msg.use_count()); SharedMessageT popped_shared_msg; popped_shared_msg = intra_process_buffer.consume_shared(); @@ -187,7 +187,7 @@ TEST(TestIntraProcessBuffer, shared_buffer_consume) { popped_unique_msg = intra_process_buffer.consume_unique(); popped_message_pointer = reinterpret_cast(popped_unique_msg.get()); - EXPECT_EQ(1u, original_shared_msg.use_count()); + EXPECT_EQ(1L, original_shared_msg.use_count()); EXPECT_EQ(*original_shared_msg, *popped_unique_msg); EXPECT_NE(original_message_pointer, popped_message_pointer); }