Migrate classes from include/fastrtps to fastdds (#4518)

* Refs #20566: Migrate fastrtps/attributes/TopicAttributes.h to fastdds/rtps/attributes Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20566: Migrate fastrtps/utils/IPFinder.h to fastdds/utils Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20566: Migrate fastrtps/utils/IPLocator.h to fastdds/utils Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20566: Migrate fastrtps/utils/collections to fastdds/utils/collections Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20566: Migrate fastrtps/utils/fixed_size_bitmap.hpp to fastdds/utils/ Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20566: Migrate fastrtps/utils/md5.h to fastdds/utils Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20566: Migrate fastrtps/utils/TimedConditionVariable.hpp to fastdds/utils Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20566: Migrate fastrtps/utils/TimedMutex.hpp to fastdds/utils Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20566: Uncrustify Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com> * Refs #20566: Reorder header following google style Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Regenerate file with updated headers Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20566: fix rebase error Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --------- Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> Signed-off-by: EduPonz <eduardoponz@eprosima.com>
eProsima · Apr 16, 2024 · 1b7529e · 1b7529e
1 parent ae60671
commit 1b7529e
Show file tree

Hide file tree

Showing 284 changed files with 13,230 additions and 12,960 deletions.
diff --git a/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationPubSubTypes.h b/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "AdvancedConfiguration.h"
 

diff --git a/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationv1.h b/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationv1.h
@@ -206,11 +206,11 @@ class AdvancedConfiguration
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -244,17 +244,18 @@ class AdvancedConfiguration
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;

diff --git a/examples/cpp/dds/BasicConfigurationExample/HelloWorldPubSubTypes.h b/examples/cpp/dds/BasicConfigurationExample/HelloWorldPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "HelloWorld.h"
 

diff --git a/examples/cpp/dds/BasicConfigurationExample/HelloWorldv1.h b/examples/cpp/dds/BasicConfigurationExample/HelloWorldv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_HELLOWORLD_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -179,11 +179,11 @@ class HelloWorld
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -217,17 +217,18 @@ class HelloWorld
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;

diff --git a/examples/cpp/dds/Configurability/samplePubSubTypes.h b/examples/cpp/dds/Configurability/samplePubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "sample.h"
 

diff --git a/examples/cpp/dds/Configurability/samplev1.h b/examples/cpp/dds/Configurability/samplev1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_SAMPLE_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -172,11 +172,11 @@ class sample
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -210,17 +210,18 @@ class sample
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint8_t m_index;

diff --git a/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldPubSubTypes.h b/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "HelloWorld.h"
 

diff --git a/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldTypeObject.cxx b/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldTypeObject.cxx
@@ -26,12 +26,14 @@ namespace { char dummy; }
 
 #include "HelloWorld.h"
 #include "HelloWorldTypeObject.h"
+
 #include <mutex>
 #include <utility>
 #include <sstream>
+
 #include <fastdds/rtps/common/CdrSerialization.hpp>
-#include <fastrtps/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/utils/md5.h>
 #include <fastrtps/types/TypeObjectFactory.h>
 #include <fastrtps/types/TypeNamesGenerator.h>
 #include <fastrtps/types/AnnotationParameterValue.h>

diff --git a/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldv1.h b/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldv1.h
@@ -26,7 +26,6 @@
 #ifndef _FAST_DDS_GENERATED_HELLOWORLD_H_
 #define _FAST_DDS_GENERATED_HELLOWORLD_H_
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
 
 #include <array>
 #include <bitset>
@@ -36,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -178,11 +179,11 @@ class HelloWorld
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -216,17 +217,18 @@ class HelloWorld
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;

diff --git a/examples/cpp/dds/CustomListenerExample/TopicPubSubTypes.h b/examples/cpp/dds/CustomListenerExample/TopicPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "Topic.h"
 

diff --git a/examples/cpp/dds/CustomListenerExample/Topicv1.h b/examples/cpp/dds/CustomListenerExample/Topicv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_TOPIC_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -179,11 +179,11 @@ class Topic
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -217,17 +217,18 @@ class Topic
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;

diff --git a/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolDataPubSubTypes.h b/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolDataPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "CustomPayloadPoolData.h"