Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support new Fast-CDR v2.0.0 [19456] #3828

Merged
merged 41 commits into from
Sep 27, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
f9a211c
Refs #18687. Fix define MEMBER_ID_INVALID
richiware Jun 13, 2023
8062a17
Refs #18687. Change API of TypeSupport
richiware Jul 4, 2023
9a4038a
Refs #18687. Move calculate_serialized_size out from types
richiware Jul 13, 2023
4e36579
Refs #18687. Move serialize/deserialize out from types
richiware Jul 17, 2023
dd6f1b0
Refs #18687. Update to new API
richiware Jul 19, 2023
afe6c5c
Refs #18687. Update .repos
richiware Jul 21, 2023
35bd47e
Refs #18687. Update .repos
richiware Jul 21, 2023
b0fb900
Refs #18687. Fix linkage on windows
richiware Jul 25, 2023
37f7180
Refs #18687. Fix linkage on windows
richiware Jul 25, 2023
34a7b7f
Refs #18687. Fix on windows
richiware Jul 25, 2023
903b7dc
Update .repos
richiware Jul 31, 2023
2c58d2f
Refs #18687. Regenerated idl files
richiware Aug 23, 2023
33adf90
Update .repos
richiware Aug 24, 2023
5964685
Refs #18687. Update after changes on CdrSizeCalculator API
richiware Aug 25, 2023
643ce30
Refs #18687. Regenerated idl files
richiware Sep 6, 2023
bd5e334
Refs #18687. Fix after rebase
richiware Sep 6, 2023
3e87c9b
Refs #18687. Fix tests.
richiware Sep 12, 2023
b100b64
Refs #18687. Fix compilation error
richiware Sep 12, 2023
deaa306
Refs #18687. Regenerated types and fix tests
richiware Sep 13, 2023
e2c3799
Refs #18687. Fix compilation statistics
richiware Sep 13, 2023
0f49c2e
Refs #18687. Recover TypeObject public api
richiware Sep 14, 2023
1e5ba35
Refs #18687. Increase is_plain api
richiware Sep 15, 2023
eb6ab86
Refs #18687. Regenerated code with fix in is_plain
richiware Sep 15, 2023
5c7fc27
Refs #18687. Apply suggesntions
richiware Sep 18, 2023
164197d
Refs #18687. Apply suggestion
richiware Sep 18, 2023
363a898
Refs #18687. Apply suggestion
richiware Sep 18, 2023
6a4537a
Refs #18687. Apply suggestion
richiware Sep 18, 2023
4a7233a
Refs #18687. Fix doxygen
richiware Sep 19, 2023
6f46ec3
Refs #18687. Apply suggestions.
richiware Sep 20, 2023
d8d15ad
Refs #18687. Apply suggestion.
richiware Sep 20, 2023
e420fe0
Refs #18687. Apply suggestion
richiware Sep 20, 2023
4115518
Refs #18687. Update versions.md
richiware Sep 20, 2023
096e950
Refs #18687. Apply suggestion
richiware Sep 20, 2023
be14760
Refs #18687. Update fastcdr submodule
richiware Sep 20, 2023
8f9ad9f
Refs #18687. Update all cmake_minimum_required
richiware Sep 20, 2023
39167ee
Refs #18687. Move CDRSerialization.hpp from dds to rtps
richiware Sep 20, 2023
23cb25a
Refs #18687. Apply suggestions
richiware Sep 21, 2023
7d0278c
Refs #18687. Fix warning on mac
richiware Sep 22, 2023
eb78332
Refs #18687. Remove Benchmark example
richiware Sep 25, 2023
042ac9a
Refs #18687. Trying compile VS2017
richiware Sep 26, 2023
9c76dcc
Refs #18687. Fix warnings after upgrade clang
richiware Sep 26, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-psabi")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-undefined,error")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-builtins")
JLBuenoLopez marked this conversation as resolved.
Show resolved Hide resolved
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl")
endif()

if(EPROSIMA_BUILD)
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/rtps/AsSocket/TestWriterSocket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ void TestWriterSocket::run(
sprintf_s((char*)ch->serializedPayload.data, 255, "My example string %d", i) + 1;
#else
ch->serializedPayload.length =
sprintf((char*)ch->serializedPayload.data, "My example string %d", i) + 1;
snprintf((char*)ch->serializedPayload.data, 255, "My example string %d", i) + 1;
#endif // if defined(_WIN32)
printf("Sending: %s\n", (char*)ch->serializedPayload.data);
mp_history->add_change(ch);
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/rtps/Persistent/TestWriterPersistent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ void TestWriterPersistent::run(
sprintf_s((char*)ch->serializedPayload.data, 255, "My example string %d", i) + 1;
#else
ch->serializedPayload.length =
sprintf((char*)ch->serializedPayload.data, "My example string %d", i) + 1;
snprintf((char*)ch->serializedPayload.data, 255, "My example string %d", i) + 1;
#endif // if defined(_WIN32)
printf("Sending: %s\n", (char*)ch->serializedPayload.data);
mp_history->add_change(ch);
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/rtps/Registered/TestWriterRegistered.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ void TestWriterRegistered::run(
sprintf_s((char*)ch->serializedPayload.data, 255, "My example string %d", i) + 1;
#else
ch->serializedPayload.length =
sprintf((char*)ch->serializedPayload.data, "My example string %d", i) + 1;
snprintf((char*)ch->serializedPayload.data, 255, "My example string %d", i) + 1;
#endif // if defined(_WIN32)
printf("Sending: %s\n", (char*)ch->serializedPayload.data);
mp_history->add_change(ch);
Expand Down
2 changes: 1 addition & 1 deletion include/fastdds/rtps/messages/CDRMessage.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ inline bool CDRMessage::readSequenceNumber(
}
bool valid = readInt32(msg, &sn->high);
valid &= readUInt32(msg, &sn->low);
return true;
return valid;
}

inline SequenceNumberSet_t CDRMessage::readSequenceNumberSet(
Expand Down
1 change: 1 addition & 0 deletions src/cpp/dynamic-types/DynamicData.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4293,6 +4293,7 @@ void DynamicData::sort_member_ids(
++curID;
}
#else
static_cast<void>(index);
while (curID <= values_.size())
{
auto it = values_.find(curID);
Expand Down
6 changes: 3 additions & 3 deletions src/cpp/fastdds/core/policy/ParameterSerializer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -507,13 +507,13 @@ inline bool ParameterSerializer<ParameterStatusInfo_t>::read_content_from_cdr_me
}
parameter.length = parameter_length;
//octet status = msg.buffer[msg.pos + 3];
bool valid = true;
fastrtps::rtps::octet tmp;
//Remove the front three octets, take the fourth
bool valid = fastrtps::rtps::CDRMessage::readOctet(cdr_message, &tmp);
valid &= fastrtps::rtps::CDRMessage::readOctet(cdr_message, &tmp);
valid &= fastrtps::rtps::CDRMessage::readOctet(cdr_message, &tmp);
valid &= fastrtps::rtps::CDRMessage::readOctet(cdr_message, &tmp);
return fastrtps::rtps::CDRMessage::readOctet(cdr_message, &parameter.status);
valid &= fastrtps::rtps::CDRMessage::readOctet(cdr_message, &parameter.status);
return valid;
}

template<>
Expand Down
Loading
Loading