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.

Sign up for GitHub

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

Jump to bottom

[21366] Bump to v2.0.0 #102

Merged
merged 2 commits into from
Aug 27, 2024
Merged

[21366] Bump to v2.0.0 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54f3ebe
Refs #21366: Bump to v2.0.0
elianalf Jul 30, 2024
ed9037a
Refs #21366: Update generate type
elianalf Aug 2, 2024
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_LI
if (GIT_TAG_VERSION)
string(REGEX MATCH "[0-9]+(\\.[0-9]+)*" PROJECT_VERSION ${GIT_TAG_VERSION} )
else()
set(PROJECT_VERSION "0.0.1")
set(PROJECT_VERSION "2.0.0")
endif()

if (NOT PROJECT_VERSION)
Expand Down
1 change: 1 addition & 0 deletions RELEASE_SUPPORT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Please, refer to the [master branch](https://github.com/eProsima/Discovery-Serve

|Fast DDS Version|Discovery Server Version|Discovery Server Latest Release|
|----------------|------------------------|-------------------------------|
|3.0|2.0.0|[v2.0.0](https://github.com/eProsima/Discovery-Server/releases/tag/v2.0.0)|
|2.14|1.2.2|[v1.2.2](https://github.com/eProsima/Discovery-Server/releases/tag/v1.2.2)|
|2.10|1.2.1|[v1.2.1](https://github.com/eProsima/Discovery-Server/releases/tag/v1.2.1)|
|2.6|1.2.1|[v1.2.1](https://github.com/eProsima/Discovery-Server/releases/tag/v1.2.1)|
Expand Down
5 changes: 5 additions & 0 deletions resources/xtypes/HelloWorldCdrAux.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,13 @@ void serialize_key(
eprosima::fastcdr::Cdr& scdr,
const HelloWorld& data)
{

static_cast<void>(scdr);
static_cast<void>(data);
scdr << data.index();

scdr << data.message();

}


Expand Down
8 changes: 4 additions & 4 deletions resources/xtypes/HelloWorldPubSubTypes.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
#include <fastdds/rtps/common/CdrSerialization.hpp>

#include "HelloWorldCdrAux.hpp"
#include "HelloWorldTypeObjectSupport.hpp"

using SerializedPayload_t = eprosima::fastdds::rtps::SerializedPayload_t;
using InstanceHandle_t = eprosima::fastdds::rtps::InstanceHandle_t;
using DataRepresentationId_t = eprosima::fastdds::dds::DataRepresentationId_t;
Expand Down Expand Up @@ -184,7 +182,8 @@ bool HelloWorldPubSubType::compute_key(
HelloWorld_max_key_cdr_typesize);

// Object that serializes the data.
eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv1);
eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::BIG_ENDIANNESS, eprosima::fastcdr::CdrVersion::XCDRv2);
ser.set_encoding_flag(eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR2);
eprosima::fastcdr::serialize_key(ser, *p_type);
if (force_md5 || HelloWorld_max_key_cdr_typesize > 16)
{
Expand All @@ -208,7 +207,8 @@ bool HelloWorldPubSubType::compute_key(

void HelloWorldPubSubType::register_type_object_representation()
{
register_HelloWorld_type_identifier(type_identifiers_);
EPROSIMA_LOG_WARNING(XTYPES_TYPE_REPRESENTATION,
"TypeObject type representation support disabled in generated code");
}


Expand Down
Loading