Skip to content

Commit

Permalink
Fix build after solving conflicts.
Browse files Browse the repository at this point in the history
Signed-off-by: Miguel Company <[email protected]>
  • Loading branch information
MiguelCompany authored May 20, 2024
1 parent 55440f4 commit a7ec05b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ TEST(BuiltinDataSerializationTests, msg_without_datasharing)
msg.length = msg.max_size;

ReaderProxyData out(max_unicast_locators, max_multicast_locators);
out.readFromCDRMessage(&msg, network, false, true);
out.readFromCDRMessage(&msg, network, true);
ASSERT_EQ(out.m_qos.data_sharing.kind(), OFF);
}

Expand All @@ -161,7 +161,7 @@ TEST(BuiltinDataSerializationTests, msg_without_datasharing)
msg.length = msg.max_size;

ReaderProxyData out(max_unicast_locators, max_multicast_locators);
out.readFromCDRMessage(&msg, network, false, true);
out.readFromCDRMessage(&msg, network, true);
ASSERT_EQ(out.m_qos.data_sharing.kind(), OFF);
}
}
Expand All @@ -184,7 +184,7 @@ TEST(BuiltinDataSerializationTests, msg_with_datasharing)
msg.length = msg.max_size;

ReaderProxyData out(max_unicast_locators, max_multicast_locators);
out.readFromCDRMessage(&msg, network, false, true);
out.readFromCDRMessage(&msg, network, true);
ASSERT_EQ(out.m_qos.data_sharing.kind(), ON);
}

Expand All @@ -204,7 +204,7 @@ TEST(BuiltinDataSerializationTests, msg_with_datasharing)
msg.length = msg.max_size;

ReaderProxyData out(max_unicast_locators, max_multicast_locators);
out.readFromCDRMessage(&msg, network, false, true);
out.readFromCDRMessage(&msg, network, true);
ASSERT_EQ(out.m_qos.data_sharing.kind(), ON);
}
}
Expand Down

0 comments on commit a7ec05b

Please sign in to comment.