Skip to content

[22188] Regenerate code with Fast DDS Gen v2.5.3 #202

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

Merged
merged 2 commits into from
May 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 types/KeylessShapeType.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @file KeylessShapeType.cpp
* This source file contains the definition of the described types in the IDL file.
*
* This file was generated by the tool gen.
* This file was generated by the tool fastddsgen (version: 2.5.3).
*/

#ifdef _WIN32
Expand Down Expand Up @@ -309,3 +309,4 @@ void shapes_demo_typesupport::idl::KeylessShapeType::serializeKey(
}



19 changes: 10 additions & 9 deletions types/KeylessShapeType.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @file KeylessShapeType.h
* This header file contains the declaration of the described types in the IDL file.
*
* This file was generated by the tool gen.
* This file was generated by the tool fastddsgen (version: 2.5.3).
*/

#ifndef _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_H_
Expand Down Expand Up @@ -44,16 +44,16 @@

#if defined(_WIN32)
#if defined(EPROSIMA_USER_DLL_EXPORT)
#if defined(KeylessShapeType_SOURCE)
#define KeylessShapeType_DllAPI __declspec( dllexport )
#if defined(KEYLESSSHAPETYPE_SOURCE)
#define KEYLESSSHAPETYPE_DllAPI __declspec( dllexport )
#else
#define KeylessShapeType_DllAPI __declspec( dllimport )
#endif // KeylessShapeType_SOURCE
#define KEYLESSSHAPETYPE_DllAPI __declspec( dllimport )
#endif // KEYLESSSHAPETYPE_SOURCE
#else
#define KeylessShapeType_DllAPI
#define KEYLESSSHAPETYPE_DllAPI
#endif // EPROSIMA_USER_DLL_EXPORT
#else
#define KeylessShapeType_DllAPI
#define KEYLESSSHAPETYPE_DllAPI
#endif // _WIN32

namespace eprosima {
Expand All @@ -67,7 +67,7 @@ namespace shapes_demo_typesupport {
namespace idl {
/*!
* @brief This class represents the structure KeylessShapeType defined by the user in the IDL file.
* @ingroup KEYLESSSHAPETYPE
* @ingroup KeylessShapeType
*/
class KeylessShapeType
{
Expand Down Expand Up @@ -276,4 +276,5 @@ namespace shapes_demo_typesupport {
} // namespace idl
} // namespace shapes_demo_typesupport

#endif // _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_H_
#endif // _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_H_

14 changes: 8 additions & 6 deletions types/KeylessShapeTypePubSubTypes.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @file KeylessShapeTypePubSubTypes.cpp
* This header file contains the implementation of the serialization functions.
*
* This file was generated by the tool fastcdrgen.
* This file was generated by the tool fastddsgen (version: 2.5.3).
*/


Expand Down Expand Up @@ -62,15 +62,15 @@ namespace shapes_demo_typesupport {
// Object that serializes the data.
eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, eprosima::fastcdr::Cdr::DDS_CDR);
payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE;
// Serialize encapsulation
ser.serialize_encapsulation();

try
{
// Serialize encapsulation
ser.serialize_encapsulation();
// Serialize the object.
p_type->serialize(ser);
}
catch (eprosima::fastcdr::exception::NotEnoughMemoryException& /*exception*/)
catch (eprosima::fastcdr::exception::Exception& /*exception*/)
{
return false;
}
Expand All @@ -86,7 +86,7 @@ namespace shapes_demo_typesupport {
{
try
{
//Convert DATA to pointer of your type
// Convert DATA to pointer of your type
KeylessShapeType* p_type = static_cast<KeylessShapeType*>(data);

// Object that manages the raw buffer.
Expand All @@ -102,7 +102,7 @@ namespace shapes_demo_typesupport {
// Deserialize the object.
p_type->deserialize(deser);
}
catch (eprosima::fastcdr::exception::NotEnoughMemoryException& /*exception*/)
catch (eprosima::fastcdr::exception::Exception& /*exception*/)
{
return false;
}
Expand Down Expand Up @@ -173,4 +173,6 @@ namespace shapes_demo_typesupport {

} //End of namespace idl


} //End of namespace shapes_demo_typesupport

10 changes: 7 additions & 3 deletions types/KeylessShapeTypePubSubTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @file KeylessShapeTypePubSubTypes.h
* This header file contains the declaration of the serialization functions.
*
* This file was generated by the tool fastcdrgen.
* This file was generated by the tool fastddsgen (version: 2.5.3).
*/


Expand All @@ -28,6 +28,7 @@

#include "KeylessShapeType.h"


#if !defined(GEN_API_VER) || (GEN_API_VER != 1)
#error \
Generated KeylessShapeType is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
Expand All @@ -37,9 +38,10 @@ namespace shapes_demo_typesupport
{
namespace idl
{

/*!
* @brief This class represents the TopicDataType of the type KeylessShapeType defined by the user in the IDL file.
* @ingroup KEYLESSSHAPETYPE
* @ingroup KeylessShapeType
*/
class KeylessShapeTypePubSubType : public eprosima::fastdds::dds::TopicDataType
{
Expand Down Expand Up @@ -100,8 +102,10 @@ namespace shapes_demo_typesupport

MD5 m_md5;
unsigned char* m_keyBuffer;

};
}
}

#endif // _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_PUBSUBTYPES_H_
#endif // _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_PUBSUBTYPES_H_

17 changes: 11 additions & 6 deletions types/KeylessShapeTypeTypeObject.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @file KeylessShapeTypeTypeObject.cpp
* This source file contains the definition of the described types in the IDL file.
*
* This file was generated by the tool gen.
* This file was generated by the tool fastddsgen (version: 2.5.3).
*/

#ifdef _WIN32
Expand All @@ -26,6 +26,7 @@ namespace { char dummy; }

#include "KeylessShapeType.h"
#include "KeylessShapeTypeTypeObject.h"
#include <mutex>
#include <utility>
#include <sstream>
#include <fastrtps/rtps/common/SerializedPayload.h>
Expand All @@ -40,14 +41,18 @@ using namespace eprosima::fastrtps::rtps;

void registerKeylessShapeTypeTypes()
{
TypeObjectFactory *factory = TypeObjectFactory::get_instance();
factory->add_type_object("shapes_demo_typesupport::idl::dds_::KeylessShapeType_", shapes_demo_typesupport::idl::GetKeylessShapeTypeIdentifier(true),
shapes_demo_typesupport::idl::GetKeylessShapeTypeObject(true));
factory->add_type_object("shapes_demo_typesupport::idl::dds_::KeylessShapeType_", shapes_demo_typesupport::idl::GetKeylessShapeTypeIdentifier(false),
shapes_demo_typesupport::idl::GetKeylessShapeTypeObject(false));
static std::once_flag once_flag;
std::call_once(once_flag, []()
{
TypeObjectFactory *factory = TypeObjectFactory::get_instance();
factory->add_type_object("shapes_demo_typesupport::idl::dds_::KeylessShapeType_", shapes_demo_typesupport::idl::GetKeylessShapeTypeIdentifier(true),
shapes_demo_typesupport::idl::GetKeylessShapeTypeObject(true));
factory->add_type_object("shapes_demo_typesupport::idl::dds_::KeylessShapeType_", shapes_demo_typesupport::idl::GetKeylessShapeTypeIdentifier(false),
shapes_demo_typesupport::idl::GetKeylessShapeTypeObject(false));



});
}

namespace shapes_demo_typesupport {
Expand Down
2 changes: 1 addition & 1 deletion types/KeylessShapeTypeTypeObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @file KeylessShapeTypeTypeObject.h
* This header file contains the declaration of the described types in the IDL file.
*
* This file was generated by the tool gen.
* This file was generated by the tool fastddsgen (version: 2.5.3).
*/

#ifndef _FAST_DDS_GENERATED_SHAPES_DEMO_TYPESUPPORT_IDL_KEYLESSSHAPETYPE_TYPE_OBJECT_H_
Expand Down
3 changes: 2 additions & 1 deletion types/Shape.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @file Shape.cpp
* This source file contains the definition of the described types in the IDL file.
*
* This file was generated by the tool gen.
* This file was generated by the tool fastddsgen (version: 2.5.3).
*/

#ifdef _WIN32
Expand Down Expand Up @@ -312,3 +312,4 @@ void ShapeType::serializeKey(


}

19 changes: 10 additions & 9 deletions types/Shape.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @file Shape.h
* This header file contains the declaration of the described types in the IDL file.
*
* This file was generated by the tool gen.
* This file was generated by the tool fastddsgen (version: 2.5.3).
*/

#ifndef _FAST_DDS_GENERATED_SHAPE_H_
Expand Down Expand Up @@ -44,16 +44,16 @@

#if defined(_WIN32)
#if defined(EPROSIMA_USER_DLL_EXPORT)
#if defined(Shape_SOURCE)
#define Shape_DllAPI __declspec( dllexport )
#if defined(SHAPE_SOURCE)
#define SHAPE_DllAPI __declspec( dllexport )
#else
#define Shape_DllAPI __declspec( dllimport )
#endif // Shape_SOURCE
#define SHAPE_DllAPI __declspec( dllimport )
#endif // SHAPE_SOURCE
#else
#define Shape_DllAPI
#define SHAPE_DllAPI
#endif // EPROSIMA_USER_DLL_EXPORT
#else
#define Shape_DllAPI
#define SHAPE_DllAPI
#endif // _WIN32

namespace eprosima {
Expand All @@ -65,7 +65,7 @@ class Cdr;

/*!
* @brief This class represents the structure ShapeType defined by the user in the IDL file.
* @ingroup SHAPE
* @ingroup Shape
*/
class ShapeType
{
Expand Down Expand Up @@ -272,4 +272,5 @@ class ShapeType

};

#endif // _FAST_DDS_GENERATED_SHAPE_H_
#endif // _FAST_DDS_GENERATED_SHAPE_H_

12 changes: 6 additions & 6 deletions types/ShapePubSubTypes.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @file ShapePubSubTypes.cpp
* This header file contains the implementation of the serialization functions.
*
* This file was generated by the tool fastcdrgen.
* This file was generated by the tool fastddsgen (version: 2.5.3).
*/


Expand Down Expand Up @@ -60,15 +60,15 @@ bool ShapeTypePubSubType::serialize(
// Object that serializes the data.
eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, eprosima::fastcdr::Cdr::DDS_CDR);
payload->encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE;
// Serialize encapsulation
ser.serialize_encapsulation();

try
{
// Serialize encapsulation
ser.serialize_encapsulation();
// Serialize the object.
p_type->serialize(ser);
}
catch (eprosima::fastcdr::exception::NotEnoughMemoryException& /*exception*/)
catch (eprosima::fastcdr::exception::Exception& /*exception*/)
{
return false;
}
Expand All @@ -84,7 +84,7 @@ bool ShapeTypePubSubType::deserialize(
{
try
{
//Convert DATA to pointer of your type
// Convert DATA to pointer of your type
ShapeType* p_type = static_cast<ShapeType*>(data);

// Object that manages the raw buffer.
Expand All @@ -100,7 +100,7 @@ bool ShapeTypePubSubType::deserialize(
// Deserialize the object.
p_type->deserialize(deser);
}
catch (eprosima::fastcdr::exception::NotEnoughMemoryException& /*exception*/)
catch (eprosima::fastcdr::exception::Exception& /*exception*/)
{
return false;
}
Expand Down
10 changes: 7 additions & 3 deletions types/ShapePubSubTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @file ShapePubSubTypes.h
* This header file contains the declaration of the serialization functions.
*
* This file was generated by the tool fastcdrgen.
* This file was generated by the tool fastddsgen (version: 2.5.3).
*/


Expand All @@ -28,14 +28,16 @@

#include "Shape.h"


#if !defined(GEN_API_VER) || (GEN_API_VER != 1)
#error \
Generated Shape is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER


/*!
* @brief This class represents the TopicDataType of the type ShapeType defined by the user in the IDL file.
* @ingroup SHAPE
* @ingroup Shape
*/
class ShapeTypePubSubType : public eprosima::fastdds::dds::TopicDataType
{
Expand Down Expand Up @@ -96,6 +98,8 @@ class ShapeTypePubSubType : public eprosima::fastdds::dds::TopicDataType

MD5 m_md5;
unsigned char* m_keyBuffer;

};

#endif // _FAST_DDS_GENERATED_SHAPE_PUBSUBTYPES_H_
#endif // _FAST_DDS_GENERATED_SHAPE_PUBSUBTYPES_H_

17 changes: 11 additions & 6 deletions types/ShapeTypeObject.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @file ShapeTypeObject.cpp
* This source file contains the definition of the described types in the IDL file.
*
* This file was generated by the tool gen.
* This file was generated by the tool fastddsgen (version: 2.5.3).
*/

#ifdef _WIN32
Expand All @@ -26,6 +26,7 @@ namespace { char dummy; }

#include "Shape.h"
#include "ShapeTypeObject.h"
#include <mutex>
#include <utility>
#include <sstream>
#include <fastrtps/rtps/common/SerializedPayload.h>
Expand All @@ -40,12 +41,16 @@ using namespace eprosima::fastrtps::rtps;

void registerShapeTypes()
{
TypeObjectFactory *factory = TypeObjectFactory::get_instance();
factory->add_type_object("ShapeType", GetShapeTypeIdentifier(true),
GetShapeTypeObject(true));
factory->add_type_object("ShapeType", GetShapeTypeIdentifier(false),
GetShapeTypeObject(false));
static std::once_flag once_flag;
std::call_once(once_flag, []()
{
TypeObjectFactory *factory = TypeObjectFactory::get_instance();
factory->add_type_object("ShapeType", GetShapeTypeIdentifier(true),
GetShapeTypeObject(true));
factory->add_type_object("ShapeType", GetShapeTypeIdentifier(false),
GetShapeTypeObject(false));

});
}

const TypeIdentifier* GetShapeTypeIdentifier(bool complete)
Expand Down
Loading