niklas/rclcpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix asserts on shared_ptr::use_count; expects long, got uint32 (#936)

Browse source 
* Fix asserts on shared_ptr::use_count; expects long, got uint32

Signed-off-by: Zachary Michaels <zmichaels11@gmail.com>

* Add suffix to integer literals to make them longs

Signed-off-by: Zachary Michaels <zmichaels11@gmail.com>

* Add missing L

Signed-off-by: Zachary Michaels <zmichaels11@gmail.com>
This commit is contained in:
Zachary Michaels 2019-12-06 11:25:58 -08:00 • committed by Dirk Thomas
parent 6ef23841f4
commit 6ba0f59fed
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rclcpp/test/test_intra_process_buffer.cpp
View file

@ -73,7 +73,7 @@ TEST(TestIntraProcessBuffer, shared_buffer_add) {
intra_process_buffer.add_shared(original_shared_msg); 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; SharedMessageT popped_shared_msg;
popped_shared_msg = intra_process_buffer.consume_shared(); 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_shared_msg = intra_process_buffer.consume_shared();
popped_message_pointer = reinterpret_cast<std::uintptr_t>(popped_shared_msg.get()); popped_message_pointer = reinterpret_cast<std::uintptr_t>(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_value, *popped_shared_msg);
EXPECT_EQ(original_message_pointer, popped_message_pointer); 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); 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; UniqueMessageT popped_unique_msg;
popped_unique_msg = intra_process_buffer.consume_unique(); 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); 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; SharedMessageT popped_shared_msg;
popped_shared_msg = intra_process_buffer.consume_shared(); 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_unique_msg = intra_process_buffer.consume_unique();
popped_message_pointer = reinterpret_cast<std::uintptr_t>(popped_unique_msg.get()); popped_message_pointer = reinterpret_cast<std::uintptr_t>(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_EQ(*original_shared_msg, *popped_unique_msg);
EXPECT_NE(original_message_pointer, popped_message_pointer); EXPECT_NE(original_message_pointer, popped_message_pointer);
} }