From e2b24df313dd8b4700c1c2a818ddc594935a1f22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Poderoso?=
 <120394830+JesusPoderoso@users.noreply.github.com>
Date: Thu, 27 Jun 2024 07:47:39 +0200
Subject: [PATCH] Adjust for Fast DDS public headers migration to .hpp  (#825)

* Refs #21128: Regenerate types

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21128: Set all .h includes as .hpp

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #21128: Fix build

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
---
 code/CodeTester.cpp                           | 16 ++++++-------
 code/DDSCodeTester.cpp                        | 24 +++++++++----------
 .../C++/DDSHelloWorld/src/HelloWorld.hpp      |  4 ++--
 .../DDSHelloWorld/src/HelloWorldCdrAux.hpp    |  6 ++---
 .../DDSHelloWorld/src/HelloWorldCdrAux.ipp    |  6 ++---
 .../src/HelloWorldPubSubTypes.cxx             |  2 +-
 ...ubSubTypes.h => HelloWorldPubSubTypes.hpp} | 18 +++++++-------
 .../DDSHelloWorld/src/HelloWorldPublisher.cpp |  2 +-
 .../src/HelloWorldSubscriber.cpp              |  2 +-
 .../src/HelloWorldTypeObjectSupport.hpp       |  6 ++---
 10 files changed, 43 insertions(+), 43 deletions(-)
 rename code/Examples/C++/DDSHelloWorld/src/{HelloWorldPubSubTypes.h => HelloWorldPubSubTypes.hpp} (89%)

diff --git a/code/CodeTester.cpp b/code/CodeTester.cpp
index c591bfc14..602e4e99e 100644
--- a/code/CodeTester.cpp
+++ b/code/CodeTester.cpp
@@ -4,14 +4,14 @@
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/reader/ReaderListener.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/RTPSDomain.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds;
diff --git a/code/DDSCodeTester.cpp b/code/DDSCodeTester.cpp
index fa943445f..6800c1459 100644
--- a/code/DDSCodeTester.cpp
+++ b/code/DDSCodeTester.cpp
@@ -38,24 +38,24 @@
 #include <fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilderFactory.hpp>
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
-#include <fastdds/rtps/common/WriteParams.h>
-#include <fastdds/rtps/history/IPayloadPool.h>
-#include <fastdds/rtps/transport/ChainingTransport.h>
-#include <fastdds/rtps/transport/ChainingTransportDescriptor.h>
+#include <fastdds/rtps/common/WriteParams.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
+#include <fastdds/rtps/transport/ChainingTransport.hpp>
+#include <fastdds/rtps/transport/ChainingTransportDescriptor.hpp>
 #include <fastdds/rtps/transport/network/AllowedNetworkInterface.hpp>
 #include <fastdds/rtps/transport/network/BlockedNetworkInterface.hpp>
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPTransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
 #include <fastdds/rtps/transport/NetworkBuffer.hpp>
 #include <fastdds/statistics/dds/domain/DomainParticipant.hpp>
 #include <fastdds/statistics/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/statistics/topic_names.hpp>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 
 using namespace eprosima::fastdds::dds;
 
@@ -6975,7 +6975,7 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp
         return true;
     }
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 };
 
diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorld.hpp b/code/Examples/C++/DDSHelloWorld/src/HelloWorld.hpp
index 971fea8d9..46d0d7b58 100644
--- a/code/Examples/C++/DDSHelloWorld/src/HelloWorld.hpp
+++ b/code/Examples/C++/DDSHelloWorld/src/HelloWorld.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorldCdrAux.hpp b/code/Examples/C++/DDSHelloWorld/src/HelloWorldCdrAux.hpp
index 6feb8a9da..1164cd5cc 100644
--- a/code/Examples/C++/DDSHelloWorld/src/HelloWorldCdrAux.hpp
+++ b/code/Examples/C++/DDSHelloWorld/src/HelloWorldCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
 #include "HelloWorld.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorldCdrAux.ipp b/code/Examples/C++/DDSHelloWorld/src/HelloWorldCdrAux.ipp
index 97df3fe9d..19316df7d 100644
--- a/code/Examples/C++/DDSHelloWorld/src/HelloWorldCdrAux.ipp
+++ b/code/Examples/C++/DDSHelloWorld/src/HelloWorldCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
 #include "HelloWorldCdrAux.hpp"
 
@@ -122,5 +122,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.cxx b/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.cxx
index 41da39407..38393dbf8 100644
--- a/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.cxx
+++ b/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h b/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.hpp
similarity index 89%
rename from code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h
rename to code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.hpp
index 3db9ca964..556d4c05e 100644
--- a/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h
+++ b/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file HelloWorldPubSubTypes.h
+ * @file HelloWorldPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "HelloWorld.hpp"
 
@@ -106,7 +106,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,10 +124,10 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
 
diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorldPublisher.cpp b/code/Examples/C++/DDSHelloWorld/src/HelloWorldPublisher.cpp
index 07cbb376b..07b77a665 100644
--- a/code/Examples/C++/DDSHelloWorld/src/HelloWorldPublisher.cpp
+++ b/code/Examples/C++/DDSHelloWorld/src/HelloWorldPublisher.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <chrono>
 #include <thread>
diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorldSubscriber.cpp b/code/Examples/C++/DDSHelloWorld/src/HelloWorldSubscriber.cpp
index af659b555..ad39d2514 100644
--- a/code/Examples/C++/DDSHelloWorld/src/HelloWorldSubscriber.cpp
+++ b/code/Examples/C++/DDSHelloWorld/src/HelloWorldSubscriber.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <chrono>
 #include <thread>
diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorldTypeObjectSupport.hpp b/code/Examples/C++/DDSHelloWorld/src/HelloWorldTypeObjectSupport.hpp
index 2eba797b0..ec922163d 100644
--- a/code/Examples/C++/DDSHelloWorld/src/HelloWorldTypeObjectSupport.hpp
+++ b/code/Examples/C++/DDSHelloWorld/src/HelloWorldTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_HelloWorld_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP