Regenerate types with Fast DDS-Gen v2.5.1 (#3615)

* Refs #18910: Regenerate types with Fast DDS-Gen v2.5.1 Signed-off-by: Eduardo Ponz <[email protected]> * Refs #18856: Remove include Signed-off-by: Eduardo Ponz <[email protected]> --------- Signed-off-by: Eduardo Ponz <[email protected]>
eProsima · Jun 26, 2023 · 674386f · 674386f
1 parent 67e1827
commit 674386f
Show file tree

Hide file tree

Showing 205 changed files with 3,088 additions and 2,609 deletions.
diff --git a/examples/cpp/dds/AdvancedConfigurationExample/HelloWorld.cxx b/examples/cpp/dds/AdvancedConfigurationExample/HelloWorld.cxx
@@ -226,3 +226,4 @@ void HelloWorld::serializeKey(
 {
     (void) scdr;
 }
+
diff --git a/examples/cpp/dds/AdvancedConfigurationExample/HelloWorld.h b/examples/cpp/dds/AdvancedConfigurationExample/HelloWorld.h
@@ -44,16 +44,16 @@
 
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
-#if defined(HelloWorld_SOURCE)
-#define HelloWorld_DllAPI __declspec( dllexport )
+#if defined(HELLOWORLD_SOURCE)
+#define HELLOWORLD_DllAPI __declspec( dllexport )
 #else
-#define HelloWorld_DllAPI __declspec( dllimport )
-#endif // HelloWorld_SOURCE
+#define HELLOWORLD_DllAPI __declspec( dllimport )
+#endif // HELLOWORLD_SOURCE
 #else
-#define HelloWorld_DllAPI
+#define HELLOWORLD_DllAPI
 #endif  // EPROSIMA_USER_DLL_EXPORT
 #else
-#define HelloWorld_DllAPI
+#define HELLOWORLD_DllAPI
 #endif // _WIN32
 
 namespace eprosima {
@@ -65,7 +65,7 @@ class Cdr;
 
 /*!
  * @brief This class represents the structure HelloWorld defined by the user in the IDL file.
- * @ingroup HELLOWORLD
+ * @ingroup HelloWorld
  */
 class HelloWorld
 {
@@ -232,4 +232,5 @@ class HelloWorld
 
 };
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_H_
+#endif // _FAST_DDS_GENERATED_HELLOWORLD_H_
+
diff --git a/examples/cpp/dds/AdvancedConfigurationExample/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/AdvancedConfigurationExample/HelloWorldPubSubTypes.cxx
@@ -60,15 +60,15 @@ bool HelloWorldPubSubType::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;
     }
@@ -84,7 +84,7 @@ bool HelloWorldPubSubType::deserialize(
 {
     try
     {
-        //Convert DATA to pointer of your type
+        // Convert DATA to pointer of your type
         HelloWorld* p_type = static_cast<HelloWorld*>(data);
 
         // Object that manages the raw buffer.
@@ -100,7 +100,7 @@ bool HelloWorldPubSubType::deserialize(
         // Deserialize the object.
         p_type->deserialize(deser);
     }
-    catch (eprosima::fastcdr::exception::NotEnoughMemoryException& /*exception*/)
+    catch (eprosima::fastcdr::exception::Exception& /*exception*/)
     {
         return false;
     }

diff --git a/examples/cpp/dds/AdvancedConfigurationExample/HelloWorldPubSubTypes.h b/examples/cpp/dds/AdvancedConfigurationExample/HelloWorldPubSubTypes.h
@@ -31,11 +31,11 @@
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 1)
 #error \
-
     Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
 #endif  // GEN_API_VER
 
 
+#ifndef SWIG
 namespace detail {
 
     template<typename Tag, typename Tag::type M>
@@ -62,9 +62,11 @@ namespace detail {
         return ((::size_t) &reinterpret_cast<char const volatile&>((((T*)0)->*get(Tag()))));
     }
 }
+#endif
+
 /*!
  * @brief This class represents the TopicDataType of the type HelloWorld defined by the user in the IDL file.
- * @ingroup HELLOWORLD
+ * @ingroup HelloWorld
  */
 class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
 {
@@ -134,4 +136,5 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
 
     }};
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
+#endif // _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
+
diff --git a/examples/cpp/dds/BasicConfigurationExample/HelloWorld.cxx b/examples/cpp/dds/BasicConfigurationExample/HelloWorld.cxx
@@ -226,3 +226,4 @@ void HelloWorld::serializeKey(
 {
     (void) scdr;
 }
+
diff --git a/examples/cpp/dds/BasicConfigurationExample/HelloWorld.h b/examples/cpp/dds/BasicConfigurationExample/HelloWorld.h
@@ -44,16 +44,16 @@
 
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
-#if defined(HelloWorld_SOURCE)
-#define HelloWorld_DllAPI __declspec( dllexport )
+#if defined(HELLOWORLD_SOURCE)
+#define HELLOWORLD_DllAPI __declspec( dllexport )
 #else
-#define HelloWorld_DllAPI __declspec( dllimport )
-#endif // HelloWorld_SOURCE
+#define HELLOWORLD_DllAPI __declspec( dllimport )
+#endif // HELLOWORLD_SOURCE
 #else
-#define HelloWorld_DllAPI
+#define HELLOWORLD_DllAPI
 #endif  // EPROSIMA_USER_DLL_EXPORT
 #else
-#define HelloWorld_DllAPI
+#define HELLOWORLD_DllAPI
 #endif // _WIN32
 
 namespace eprosima {
@@ -65,7 +65,7 @@ class Cdr;
 
 /*!
  * @brief This class represents the structure HelloWorld defined by the user in the IDL file.
- * @ingroup HELLOWORLD
+ * @ingroup HelloWorld
  */
 class HelloWorld
 {
@@ -232,4 +232,5 @@ class HelloWorld
 
 };
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_H_
+#endif // _FAST_DDS_GENERATED_HELLOWORLD_H_
+
diff --git a/examples/cpp/dds/BasicConfigurationExample/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/BasicConfigurationExample/HelloWorldPubSubTypes.cxx
@@ -60,15 +60,15 @@ bool HelloWorldPubSubType::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;
     }
@@ -84,7 +84,7 @@ bool HelloWorldPubSubType::deserialize(
 {
     try
     {
-        //Convert DATA to pointer of your type
+        // Convert DATA to pointer of your type
         HelloWorld* p_type = static_cast<HelloWorld*>(data);
 
         // Object that manages the raw buffer.
@@ -100,7 +100,7 @@ bool HelloWorldPubSubType::deserialize(
         // Deserialize the object.
         p_type->deserialize(deser);
     }
-    catch (eprosima::fastcdr::exception::NotEnoughMemoryException& /*exception*/)
+    catch (eprosima::fastcdr::exception::Exception& /*exception*/)
     {
         return false;
     }

diff --git a/examples/cpp/dds/BasicConfigurationExample/HelloWorldPubSubTypes.h b/examples/cpp/dds/BasicConfigurationExample/HelloWorldPubSubTypes.h
@@ -31,11 +31,11 @@
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 1)
 #error \
-
     Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
 #endif  // GEN_API_VER
 
 
+#ifndef SWIG
 namespace detail {
 
     template<typename Tag, typename Tag::type M>
@@ -62,9 +62,11 @@ namespace detail {
         return ((::size_t) &reinterpret_cast<char const volatile&>((((T*)0)->*get(Tag()))));
     }
 }
+#endif
+
 /*!
  * @brief This class represents the TopicDataType of the type HelloWorld defined by the user in the IDL file.
- * @ingroup HELLOWORLD
+ * @ingroup HelloWorld
  */
 class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
 {
@@ -134,4 +136,5 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
 
     }};
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
+#endif // _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
+
diff --git a/examples/cpp/dds/Benchmark/Benchmark.cxx b/examples/cpp/dds/Benchmark/Benchmark.cxx
@@ -174,3 +174,4 @@ void BenchMark::serializeKey(
 {
     (void) scdr;
 }
+
diff --git a/examples/cpp/dds/Benchmark/Benchmark.h b/examples/cpp/dds/Benchmark/Benchmark.h
@@ -44,16 +44,16 @@
 
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
-#if defined(Benchmark_SOURCE)
-#define Benchmark_DllAPI __declspec( dllexport )
+#if defined(BENCHMARK_SOURCE)
+#define BENCHMARK_DllAPI __declspec( dllexport )
 #else
-#define Benchmark_DllAPI __declspec( dllimport )
-#endif // Benchmark_SOURCE
+#define BENCHMARK_DllAPI __declspec( dllimport )
+#endif // BENCHMARK_SOURCE
 #else
-#define Benchmark_DllAPI
+#define BENCHMARK_DllAPI
 #endif  // EPROSIMA_USER_DLL_EXPORT
 #else
-#define Benchmark_DllAPI
+#define BENCHMARK_DllAPI
 #endif // _WIN32
 
 namespace eprosima {
@@ -65,7 +65,7 @@ class Cdr;
 
 /*!
  * @brief This class represents the structure BenchMark defined by the user in the IDL file.
- * @ingroup BENCHMARK
+ * @ingroup Benchmark
  */
 class BenchMark
 {
@@ -206,4 +206,5 @@ class BenchMark
 
 };
 
-#endif // _FAST_DDS_GENERATED_BENCHMARK_H_
+#endif // _FAST_DDS_GENERATED_BENCHMARK_H_
+
diff --git a/examples/cpp/dds/Benchmark/BenchmarkPubSubTypes.cxx b/examples/cpp/dds/Benchmark/BenchmarkPubSubTypes.cxx
@@ -60,15 +60,15 @@ bool BenchMarkPubSubType::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;
     }
@@ -84,7 +84,7 @@ bool BenchMarkPubSubType::deserialize(
 {
     try
     {
-        //Convert DATA to pointer of your type
+        // Convert DATA to pointer of your type
         BenchMark* p_type = static_cast<BenchMark*>(data);
 
         // Object that manages the raw buffer.
@@ -100,7 +100,7 @@ bool BenchMarkPubSubType::deserialize(
         // Deserialize the object.
         p_type->deserialize(deser);
     }
-    catch (eprosima::fastcdr::exception::NotEnoughMemoryException& /*exception*/)
+    catch (eprosima::fastcdr::exception::Exception& /*exception*/)
     {
         return false;
     }

diff --git a/examples/cpp/dds/Benchmark/BenchmarkPubSubTypes.h b/examples/cpp/dds/Benchmark/BenchmarkPubSubTypes.h
@@ -31,11 +31,11 @@
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 1)
 #error \
-
     Generated Benchmark is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
 #endif  // GEN_API_VER
 
 
+#ifndef SWIG
 namespace detail {
 
     template<typename Tag, typename Tag::type M>
@@ -62,9 +62,11 @@ namespace detail {
         return ((::size_t) &reinterpret_cast<char const volatile&>((((T*)0)->*get(Tag()))));
     }
 }
+#endif
+
 /*!
  * @brief This class represents the TopicDataType of the type BenchMark defined by the user in the IDL file.
- * @ingroup BENCHMARK
+ * @ingroup Benchmark
  */
 class BenchMarkPubSubType : public eprosima::fastdds::dds::TopicDataType
 {
@@ -134,4 +136,5 @@ class BenchMarkPubSubType : public eprosima::fastdds::dds::TopicDataType
 
     }};
 
-#endif // _FAST_DDS_GENERATED_BENCHMARK_PUBSUBTYPES_H_
+#endif // _FAST_DDS_GENERATED_BENCHMARK_PUBSUBTYPES_H_
+
diff --git a/examples/cpp/dds/Benchmark/Benchmark_big.cxx b/examples/cpp/dds/Benchmark/Benchmark_big.cxx
@@ -226,3 +226,4 @@ void BenchMarkBig::serializeKey(
 {
     (void) scdr;
 }
+
diff --git a/examples/cpp/dds/Benchmark/Benchmark_big.h b/examples/cpp/dds/Benchmark/Benchmark_big.h
@@ -44,16 +44,16 @@
 
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
-#if defined(Benchmark_big_SOURCE)
-#define Benchmark_big_DllAPI __declspec( dllexport )
+#if defined(BENCHMARK_BIG_SOURCE)
+#define BENCHMARK_BIG_DllAPI __declspec( dllexport )
 #else
-#define Benchmark_big_DllAPI __declspec( dllimport )
-#endif // Benchmark_big_SOURCE
+#define BENCHMARK_BIG_DllAPI __declspec( dllimport )
+#endif // BENCHMARK_BIG_SOURCE
 #else
-#define Benchmark_big_DllAPI
+#define BENCHMARK_BIG_DllAPI
 #endif  // EPROSIMA_USER_DLL_EXPORT
 #else
-#define Benchmark_big_DllAPI
+#define BENCHMARK_BIG_DllAPI
 #endif // _WIN32
 
 namespace eprosima {
@@ -65,7 +65,7 @@ class Cdr;
 
 /*!
  * @brief This class represents the structure BenchMarkBig defined by the user in the IDL file.
- * @ingroup BENCHMARK_BIG
+ * @ingroup Benchmark_big
  */
 class BenchMarkBig
 {
@@ -232,4 +232,5 @@ class BenchMarkBig
 
 };
 
-#endif // _FAST_DDS_GENERATED_BENCHMARK_BIG_H_
+#endif // _FAST_DDS_GENERATED_BENCHMARK_BIG_H_
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -226,3 +226,4 @@ void HelloWorld::serializeKey(
		{
		(void) scdr;
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -174,3 +174,4 @@ void BenchMark::serializeKey(
		{
		(void) scdr;
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -226,3 +226,4 @@ void BenchMarkBig::serializeKey(
		{
		(void) scdr;
		}