From f8ad59a223e28458e584d1b81a2754350125ff80 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Wed, 27 Nov 2024 10:12:41 +0100 Subject: [PATCH 1/2] Regenerate types with Fast-DDS-Gen v3.3.1 Signed-off-by: Eugenio Collado --- code/Examples/C++/DDSHelloWorld/src/HelloWorld.cxx | 3 --- code/Examples/C++/DDSHelloWorld/src/HelloWorld.h | 6 ------ .../C++/DDSHelloWorld/src/HelloWorldPubSubTypes.cxx | 5 +++++ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorld.cxx b/code/Examples/C++/DDSHelloWorld/src/HelloWorld.cxx index 4b415d677..ef9331d5d 100644 --- a/code/Examples/C++/DDSHelloWorld/src/HelloWorld.cxx +++ b/code/Examples/C++/DDSHelloWorld/src/HelloWorld.cxx @@ -28,8 +28,6 @@ char dummy; #include "HelloWorld.h" -#if FASTCDR_VERSION_MAJOR > 1 - #include @@ -165,4 +163,3 @@ std::string& HelloWorld::message() // Include auxiliary functions like for serializing/deserializing. #include "HelloWorldCdrAux.ipp" -#endif // FASTCDR_VERSION_MAJOR > 1 diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorld.h b/code/Examples/C++/DDSHelloWorld/src/HelloWorld.h index 5cd0ddba5..b95bcb5b1 100644 --- a/code/Examples/C++/DDSHelloWorld/src/HelloWorld.h +++ b/code/Examples/C++/DDSHelloWorld/src/HelloWorld.h @@ -19,11 +19,6 @@ * This file was generated by the tool fastddsgen. */ -#include -#include "HelloWorldv1.h" - -#if FASTCDR_VERSION_MAJOR > 1 - #ifndef _FAST_DDS_GENERATED_HELLOWORLD_H_ #define _FAST_DDS_GENERATED_HELLOWORLD_H_ @@ -192,4 +187,3 @@ class HelloWorld -#endif // FASTCDR_VERSION_MAJOR > 1 diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.cxx b/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.cxx index 85cb47789..28f6913f8 100644 --- a/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.cxx +++ b/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.cxx @@ -83,6 +83,11 @@ bool HelloWorldPubSubType::serialize( ser.serialize_encapsulation(); // Serialize the object. ser << *p_type; +#if FASTCDR_VERSION_MAJOR > 1 + ser.set_dds_cdr_options({0,0}); +#else + ser.setDDSCdrOptions(0); +#endif // FASTCDR_VERSION_MAJOR > 1 } catch (eprosima::fastcdr::exception::Exception& /*exception*/) { From 12830f9642040dced75b813e84d7902cdbbbffca Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Wed, 27 Nov 2024 10:39:58 +0100 Subject: [PATCH 2/2] Regenerate types for both versions of Fast CDR Signed-off-by: Eugenio Collado --- code/Examples/C++/DDSHelloWorld/src/HelloWorld.cxx | 3 +++ code/Examples/C++/DDSHelloWorld/src/HelloWorld.h | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorld.cxx b/code/Examples/C++/DDSHelloWorld/src/HelloWorld.cxx index ef9331d5d..4b415d677 100644 --- a/code/Examples/C++/DDSHelloWorld/src/HelloWorld.cxx +++ b/code/Examples/C++/DDSHelloWorld/src/HelloWorld.cxx @@ -28,6 +28,8 @@ char dummy; #include "HelloWorld.h" +#if FASTCDR_VERSION_MAJOR > 1 + #include @@ -163,3 +165,4 @@ std::string& HelloWorld::message() // Include auxiliary functions like for serializing/deserializing. #include "HelloWorldCdrAux.ipp" +#endif // FASTCDR_VERSION_MAJOR > 1 diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorld.h b/code/Examples/C++/DDSHelloWorld/src/HelloWorld.h index b95bcb5b1..5cd0ddba5 100644 --- a/code/Examples/C++/DDSHelloWorld/src/HelloWorld.h +++ b/code/Examples/C++/DDSHelloWorld/src/HelloWorld.h @@ -19,6 +19,11 @@ * This file was generated by the tool fastddsgen. */ +#include +#include "HelloWorldv1.h" + +#if FASTCDR_VERSION_MAJOR > 1 + #ifndef _FAST_DDS_GENERATED_HELLOWORLD_H_ #define _FAST_DDS_GENERATED_HELLOWORLD_H_ @@ -187,3 +192,4 @@ class HelloWorld +#endif // FASTCDR_VERSION_MAJOR > 1