Refs #21128: Update mock's guards and .h to .hpp

Signed-off-by: JesusPoderoso <[email protected]>
eProsima · Jun 19, 2024 · e2f1707 · e2f1707
1 parent 5089cc3
commit e2f1707
Show file tree

Hide file tree

Showing 34 changed files with 197 additions and 124 deletions.
diff --git a/test/mock/dds/DomainParticipantFactory/fastdds/dds/domain/DomainParticipantFactory.hpp b/test/mock/dds/DomainParticipantFactory/fastdds/dds/domain/DomainParticipantFactory.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_DDS_DOMAIN_DOMAINPARTICIPANT_FACTORY_HPP_
-#define _FASTDDS_DDS_DOMAIN_DOMAINPARTICIPANT_FACTORY_HPP_
+#ifndef FASTDDS_DDS_DOMAIN__DOMAINPARTICIPANTFACTORY_HPP
+#define FASTDDS_DDS_DOMAIN__DOMAINPARTICIPANTFACTORY_HPP
 
 #include <memory>
 
@@ -66,4 +66,4 @@ class DomainParticipantFactory
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif /* _FASTDDS_DDS_DOMAIN_DOMAINPARTICIPANT_FACTORY_HPP_*/
+#endif // FASTDDS_DDS_DOMAIN__DOMAINPARTICIPANTFACTORY_HPP
diff --git a/test/mock/dds/QosPolicies/fastdds/dds/core/policy/QosPolicies.hpp b/test/mock/dds/QosPolicies/fastdds/dds/core/policy/QosPolicies.hpp
@@ -13,12 +13,12 @@
 // limitations under the License.
 
 /**
- * @file QosPolicies.h
+ * @file QosPolicies.hpp
  *
  */
 
-#ifndef _FASTDDS_DDS_QOS_QOSPOLICIES_HPP_
-#define _FASTDDS_DDS_QOS_QOSPOLICIES_HPP_
+#ifndef FASTDDS_DDS_CORE_POLICY__QOSPOLICIES_HPP
+#define FASTDDS_DDS_CORE_POLICY__QOSPOLICIES_HPP
 
 #include <bitset>
 #include <vector>
@@ -1615,4 +1615,4 @@ class TypeInformationParameter : public Parameter_t, public QosPolicy
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _FASTDDS_DDS_QOS_QOSPOLICIES_HPP_
+#endif // FASTDDS_DDS_CORE_POLICY__QOSPOLICIES_HPP
diff --git a/test/mock/dds/Topic/fastdds/dds/topic/Topic.hpp b/test/mock/dds/Topic/fastdds/dds/topic/Topic.hpp
@@ -16,8 +16,8 @@
  * @file Topic.hpp
  */
 
-#ifndef _FASTDDS_TOPIC_HPP_
-#define _FASTDDS_TOPIC_HPP_
+#ifndef FASTDDS_DDS_TOPIC__TOPIC_HPP
+#define FASTDDS_DDS_TOPIC__TOPIC_HPP
 
 #include <fastdds/dds/core/Entity.hpp>
 #include <fastdds/dds/core/status/BaseStatus.hpp>
@@ -50,4 +50,4 @@ class Topic : public TopicDescription
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_TOPIC_HPP_
+#endif // FASTDDS_DDS_TOPIC__TOPIC_HPP
diff --git a/test/mock/dds/TypeObjectUtils/fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp b/test/mock/dds/TypeObjectUtils/fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp
@@ -13,12 +13,12 @@
 // limitations under the License.
 
 /*!
- * @file
+ * @file TypeObjectUtils.hpp
  * This file contains static functions to help build a TypeObject.
  */
 
-#ifndef _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTUTILS_HPP_
-#define _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTUTILS_HPP_
+#ifndef FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTUTILS_HPP
+#define FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTUTILS_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -50,9 +50,9 @@ class TypeObjectUtils
 
 };
 
-} // xtypes
-} // dds
-} // fastdds
-} // eprosima
+} // namespace xtypes
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif // _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTUTILS_HPP_
+#endif // FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTUTILS_HPP
diff --git a/test/mock/dds/TypeSupport/fastdds/dds/topic/TypeSupport.hpp b/test/mock/dds/TypeSupport/fastdds/dds/topic/TypeSupport.hpp
@@ -16,8 +16,8 @@
  * @file TypeSupport.hpp
  */
 
-#ifndef _FASTDDS_TYPE_SUPPORT_HPP_
-#define _FASTDDS_TYPE_SUPPORT_HPP_
+#ifndef FASTDDS_DDS_TOPIC__TYPESUPPORT_HPP
+#define FASTDDS_DDS_TOPIC__TYPESUPPORT_HPP
 
 #include <fastdds/dds/topic/TopicDataType.hpp>
 
@@ -43,4 +43,4 @@ class TypeSupport : public std::shared_ptr<fastdds::dds::TopicDataType>
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_TYPE_SUPPORT_HPP_
+#endif // FASTDDS_DDS_TOPIC__TYPESUPPORT_HPP
diff --git a/test/mock/rtps/BuiltinProtocols/rtps/builtin/BuiltinProtocols.h b/test/mock/rtps/BuiltinProtocols/rtps/builtin/BuiltinProtocols.h
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 /**
- * @file BiultinProtocols.h
+ * @file BuiltinProtocols.h
  */
 
 #ifndef _FASTDDS_RTPS_BUILTINPROTOCOLS_H_
@@ -70,4 +70,4 @@ class BuiltinProtocols
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_ENDPOINT_H_
+#endif // _FASTDDS_RTPS_BUILTINPROTOCOLS_H_
diff --git a/test/mock/rtps/DataSharingPayloadPool/rtps/DataSharing/DataSharingPayloadPool.hpp b/test/mock/rtps/DataSharingPayloadPool/rtps/DataSharing/DataSharingPayloadPool.hpp
@@ -16,8 +16,8 @@
  * @file DataSharingPayloadPool.hpp
  */
 
-#ifndef RTPS_HISTORY_DATASHARINGPAYLOADPOOL_HPP
-#define RTPS_HISTORY_DATASHARINGPAYLOADPOOL_HPP
+#ifndef RTPS_DATASHARING_DATASHARINGPAYLOADPOOL_HPP
+#define RTPS_DATASHARING_DATASHARINGPAYLOADPOOL_HPP
 
 #include <fastdds/rtps/common/CacheChange.hpp>
 #include <fastdds/rtps/history/IPayloadPool.hpp>
@@ -165,4 +165,4 @@ class DataSharingPayloadPool : public IPayloadPool
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif  // RTPS_HISTORY_DATASHARINGPAYLOADPOOL_HPP
+#endif  // RTPS_DATASHARING_DATASHARINGPAYLOADPOOL_HPP
diff --git a/...ock/rtps/Endpoint/fastdds/rtps/Endpoint.h → ...k/rtps/Endpoint/fastdds/rtps/Endpoint.hpp b/...ock/rtps/Endpoint/fastdds/rtps/Endpoint.h → ...k/rtps/Endpoint/fastdds/rtps/Endpoint.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file Endpoint.h
+ * @file Endpoint.hpp
  */
 
-#ifndef _FASTDDS_RTPS_ENDPOINT_H_
-#define _FASTDDS_RTPS_ENDPOINT_H_
+#ifndef FASTDDS_RTPS__ENDPOINT_HPP
+#define FASTDDS_RTPS__ENDPOINT_HPP
 
 #include <fastdds/utils/TimedMutex.hpp>
 #include <fastdds/rtps/attributes/EndpointAttributes.hpp>
@@ -64,4 +64,4 @@ class Endpoint
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_ENDPOINT_H_
+#endif // FASTDDS_RTPS__ENDPOINT_HPP
diff --git a/test/mock/rtps/Log/fastdds/dds/log/FileConsumer.hpp b/test/mock/rtps/Log/fastdds/dds/log/FileConsumer.hpp
@@ -13,12 +13,12 @@
 // limitations under the License.
 
 /**
- * @file FileConsumer.h
+ * @file FileConsumer.hpp
  *
  */
 
-#ifndef _FASTDDS_DDS_LOG_FILECONSUMER_HPP_
-#define _FASTDDS_DDS_LOG_FILECONSUMER_HPP_
+#ifndef FASTDDS_DDS_LOG__FILECONSUMER_HPP
+#define FASTDDS_DDS_LOG__FILECONSUMER_HPP
 
 #include <gmock/gmock.h>
 
@@ -54,4 +54,4 @@ MATCHER(IsFileConsumer, "Argument is a FileConsumer object?")
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_DDS_LOG_FILECONSUMER_HPP_
+#endif // FASTDDS_DDS_LOG__FILECONSUMER_HPP
diff --git a/test/mock/rtps/Log/fastdds/dds/log/Log.hpp b/test/mock/rtps/Log/fastdds/dds/log/Log.hpp
@@ -12,9 +12,14 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-//
-#ifndef _FASTDDS_DDS_LOG_LOG_HPP_
-#define _FASTDDS_DDS_LOG_LOG_HPP_
+
+/**
+ * @file Log.hpp
+ *
+ */
+
+#ifndef FASTDDS_DDS_LOG__LOG_HPP
+#define FASTDDS_DDS_LOG__LOG_HPP
 
 #include <functional>
 #include <memory>
@@ -118,4 +123,4 @@ class LogMock
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_DDS_LOG_LOG_HPP_
+#endif // FASTDDS_DDS_LOG__LOG_HPP
diff --git a/test/mock/rtps/Log/fastdds/dds/log/OStreamConsumer.hpp b/test/mock/rtps/Log/fastdds/dds/log/OStreamConsumer.hpp
@@ -12,8 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_DDS_LOG_OSTREAMCONSUMER_HPP_
-#define _FASTDDS_DDS_LOG_OSTREAMCONSUMER_HPP_
+/**
+ * @file OStreamConsumer.hpp
+ *
+ */
+
+#ifndef FASTDDS_DDS_LOG__OSTREAMCONSUMER_HPP
+#define FASTDDS_DDS_LOG__OSTREAMCONSUMER_HPP
 
 #include <fastdds/dds/log/Log.hpp>
 
@@ -29,4 +34,4 @@ class OStreamConsumer : public LogConsumer
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // ifndef _FASTDDS_DDS_LOG_OSTREAMCONSUMER_HPP_
+#endif // ifndef FASTDDS_DDS_LOG__OSTREAMCONSUMER_HPP
diff --git a/test/mock/rtps/Log/fastdds/dds/log/StdoutConsumer.hpp b/test/mock/rtps/Log/fastdds/dds/log/StdoutConsumer.hpp
@@ -12,8 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_DDS_LOG_STDOUTCONSUMER_HPP_
-#define _FASTDDS_DDS_LOG_STDOUTCONSUMER_HPP_
+/**
+ * @file StdoutConsumer.hpp
+ *
+ */
+
+#ifndef FASTDDS_DDS_LOG__STDOUTCONSUMER_HPP
+#define FASTDDS_DDS_LOG__STDOUTCONSUMER_HPP
 
 #include <fastdds/dds/log/Log.hpp>
 
@@ -32,4 +37,4 @@ class StdoutConsumer : public LogConsumer
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // ifndef _FASTDDS_DDS_LOG_STDOUTCONSUMER_HPP_
+#endif // ifndef FASTDDS_DDS_LOG__STDOUTCONSUMER_HPP
diff --git a/test/mock/rtps/Log/fastdds/dds/log/StdoutErrConsumer.hpp b/test/mock/rtps/Log/fastdds/dds/log/StdoutErrConsumer.hpp
@@ -12,8 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_DDS_LOG_STDOUTERRCONSUMER_HPP_
-#define _FASTDDS_DDS_LOG_STDOUTERRCONSUMER_HPP_
+/**
+ * @file StdoutErrConsumer.hpp
+ *
+ */
+
+#ifndef FASTDDS_DDS_LOG__STDOUTERRCONSUMER_HPP
+#define FASTDDS_DDS_LOG__STDOUTERRCONSUMER_HPP
 
 #include <gmock/gmock.h>
 
@@ -51,4 +56,4 @@ MATCHER(IsStdoutErrConsumer, "Argument is a StdoutErrConsumer object?")
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_DDS_LOG_STDOUTERRCONSUMER_HPP_
+#endif // FASTDDS_DDS_LOG__STDOUTERRCONSUMER_HPP
diff --git a/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h b/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h
@@ -16,8 +16,8 @@
  * @file PDP.h
  */
 
-#ifndef _FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT_PDP_H_
-#define _FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT_PDP_H_
+#ifndef _FASTDDS_RTPS_PDP_H_
+#define _FASTDDS_RTPS_PDP_H_
 
 #include <gmock/gmock.h>
 
@@ -126,4 +126,4 @@ class PDP
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT_PDP_H_
+#endif // _FASTDDS_RTPS_PDP_H_
diff --git a/test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.hpp b/test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.hpp
@@ -15,8 +15,8 @@
 /**
  * @file ParticipantProxyData.hpp
  */
-#ifndef _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_HPP_
-#define _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_HPP_
+#ifndef FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
+#define FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
 
 #include <fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp>
 #include <fastdds/rtps/common/CDRMessage_t.hpp>
@@ -81,4 +81,4 @@ class ParticipantProxyData
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_HPP_
+#endif // FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
diff --git a/...rtps/RTPSDomain/fastdds/rtps/RTPSDomain.h → ...ps/RTPSDomain/fastdds/rtps/RTPSDomain.hpp b/...rtps/RTPSDomain/fastdds/rtps/RTPSDomain.h → ...ps/RTPSDomain/fastdds/rtps/RTPSDomain.hpp
@@ -12,8 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_RTPS_DOMAIN_H_
-#define _FASTDDS_RTPS_DOMAIN_H_
+/**
+ * @file RTPSDomain.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS__RTPSDOMAIN_HPP
+#define FASTDDS_RTPS__RTPSDOMAIN_HPP
 
 #include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
@@ -192,4 +197,4 @@ class RTPSDomain
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_DOMAIN_H_*/
+#endif // FASTDDS_RTPS__RTPSDOMAIN_HPP
diff --git a/...astdds/rtps/participant/RTPSParticipant.h → ...tdds/rtps/participant/RTPSParticipant.hpp b/...astdds/rtps/participant/RTPSParticipant.h → ...tdds/rtps/participant/RTPSParticipant.hpp
@@ -12,9 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+/**
+ * @file RTPSParticipant.hpp
+ *
+ */
 
-#ifndef _FASTDDS_RTPS_RTPSParticipant_H_
-#define _FASTDDS_RTPS_RTPSParticipant_H_
+#ifndef FASTDDS_RTPS_PARTICIPANT__RTPSPARTICIPANTLISTENER_HPP
+#define FASTDDS_RTPS_PARTICIPANT__RTPSPARTICIPANTLISTENER_HPP
 
 #include <cstdlib>
 #include <memory>
@@ -252,8 +256,8 @@ class FASTDDS_EXPORTED_API RTPSParticipant
     RTPSParticipantImpl* mp_impl;
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps 
+} // namespace fastdds 
+} // namespace eprosima 
 
-#endif /* _FASTDDS_RTPS_RTPSParticipant_H_ */
+#endif // FASTDDS_RTPS_PARTICIPANT__RTPSPARTICIPANTLISTENER_HPP 
diff --git a/...ps/attributes/RTPSParticipantAttributes.h → .../attributes/RTPSParticipantAttributes.hpp b/...ps/attributes/RTPSParticipantAttributes.h → .../attributes/RTPSParticipantAttributes.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file RTPSParticipantAttributes.h
+ * @file RTPSParticipantAttributes.hpp
  */
 
-#ifndef _FASTDDS_RTPSPARTICIPANTPARAMETERS_H_
-#define _FASTDDS_RTPSPARTICIPANTPARAMETERS_H_
+#ifndef FASTDDS_RTPS_ATTRIBUTES__RTPSPARTICIPANTATTRIBUTES_HPP
+#define FASTDDS_RTPS_ATTRIBUTES__RTPSPARTICIPANTATTRIBUTES_HPP
 
 #include <memory>
 #include <sstream>
@@ -634,4 +634,4 @@ class RTPSParticipantAttributes
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif  // _FASTDDS_RTPSPARTICIPANTPARAMETERS_H_
+#endif  // FASTDDS_RTPS_ATTRIBUTES__RTPSPARTICIPANTATTRIBUTES_HPP
diff --git a/...PSReader/fastdds/rtps/reader/RTPSReader.h → ...Reader/fastdds/rtps/reader/RTPSReader.hpp b/...PSReader/fastdds/rtps/reader/RTPSReader.h → ...Reader/fastdds/rtps/reader/RTPSReader.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file RTPSReader.h
+ * @file RTPSReader.hpp
  */
 
-#ifndef _FASTDDS_RTPS_READER_RTPSREADER_H_
-#define _FASTDDS_RTPS_READER_RTPSREADER_H_
+#ifndef FASTDDS_RTPS_READER__RTPSREADER_HPP
+#define FASTDDS_RTPS_READER__RTPSREADER_HPP
 
 #include <gmock/gmock.h>
 
@@ -161,4 +161,4 @@ class RTPSReader : public Endpoint
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_READER_RTPSREADER_H_
+#endif // FASTDDS_RTPS_READER__RTPSREADER_HPP