From b1f21c328a59019371c131f41f25f2f791207a20 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:01:28 +0200 Subject: [PATCH] Update guards and extenstion .h to .hpp in headers (#358) * Refs #21128: Update guards and .h to .hpp Signed-off-by: JesusPoderoso * Refs #21128: Fix uncrustify Signed-off-by: JesusPoderoso * Refs #21128: Apply rev suggestion Signed-off-by: JesusPoderoso --------- Signed-off-by: JesusPoderoso --- .../fastcdr/idl/templates/TypesHeader.stg | 4 ++-- .../java/com/eprosima/fastdds/fastddsgen.java | 20 ++++++++--------- .../fastdds/idl/templates/DDSPubSubMain.stg | 4 ++-- .../idl/templates/DDSPubSubTypeHeader.stg | 22 +++++++++---------- .../idl/templates/DDSPubSubTypeSource.stg | 2 +- .../templates/DDSPubSubTypeSwigInterface.stg | 4 ++-- .../idl/templates/DDSPublisherHeader.stg | 8 +++---- .../idl/templates/DDSPublisherSource.stg | 4 ++-- .../idl/templates/DDSSubscriberHeader.stg | 8 +++---- .../idl/templates/DDSSubscriberSource.stg | 4 ++-- .../fastdds/idl/templates/JNISource.stg | 4 ++-- .../idl/templates/SerializationHeader.stg | 8 +++---- .../idl/templates/SerializationSource.stg | 4 ++-- .../idl/templates/SerializationTestSource.stg | 6 ++--- .../templates/TypeObjectTestingTestSource.stg | 2 +- .../idl/templates/TypesCdrAuxHeader.stg | 6 ++--- .../idl/templates/TypesCdrAuxHeaderImpl.stg | 6 ++--- .../idl/templates/XTypesTypeObjectHeader.stg | 6 ++--- 18 files changed, 61 insertions(+), 61 deletions(-) diff --git a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg index b7fd6016..a4191af6 100644 --- a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg +++ b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg @@ -20,8 +20,8 @@ import "FastCdrCommon.stg" main(ctx, definitions) ::= << $fileHeader(ctx=ctx, file=[ctx.filename, ".hpp"], description=["This header file contains the declaration of the described types in the IDL file."])$ -#ifndef _FAST_DDS_GENERATED_$ctx.headerGuardName$_HPP_ -#define _FAST_DDS_GENERATED_$ctx.headerGuardName$_HPP_ +#ifndef FAST_DDS_GENERATED__$ctx.headerGuardName$_HPP +#define FAST_DDS_GENERATED__$ctx.headerGuardName$_HPP $if(ctx.thereIsArray)$ #include diff --git a/src/main/java/com/eprosima/fastdds/fastddsgen.java b/src/main/java/com/eprosima/fastdds/fastddsgen.java index 4af7bc6f..40b4c7c4 100644 --- a/src/main/java/com/eprosima/fastdds/fastddsgen.java +++ b/src/main/java/com/eprosima/fastdds/fastddsgen.java @@ -943,7 +943,7 @@ private Project parseIDL( project.addCommonTestingFile(relative_dir + ctx.getFilename() + "Serialization.cpp"); System.out.println("Generating Serialization Header file..."); - String fileNameH = output_dir + ctx.getFilename() + "Serialization.h"; + String fileNameH = output_dir + ctx.getFilename() + "Serialization.hpp"; returnedValue = Utils.writeFile(fileNameH, maintemplates.getTemplate("com/eprosima/fastdds/idl/templates/SerializationHeader.stg"), m_replace); @@ -993,9 +993,9 @@ private Project parseIDL( } } returnedValue &= - Utils.writeFile(output_dir + ctx.getFilename() + "PubSubTypes.h", + Utils.writeFile(output_dir + ctx.getFilename() + "PubSubTypes.hpp", maintemplates.getTemplate("com/eprosima/fastdds/idl/templates/DDSPubSubTypeHeader.stg"), m_replace); - project.addCommonIncludeFile(relative_dir + ctx.getFilename() + "PubSubTypes.h"); + project.addCommonIncludeFile(relative_dir + ctx.getFilename() + "PubSubTypes.hpp"); if (ctx.existsLastStructure()) { m_atLeastOneStructure = true; @@ -1019,28 +1019,28 @@ private Project parseIDL( { System.out.println("Generating Publisher files..."); if (returnedValue = - Utils.writeFile(output_dir + ctx.getFilename() + "Publisher.h", + Utils.writeFile(output_dir + ctx.getFilename() + "Publisher.hpp", maintemplates.getTemplate("com/eprosima/fastdds/idl/templates/DDSPublisherHeader.stg"), m_replace)) { if (returnedValue = Utils.writeFile(output_dir + ctx.getFilename() + "Publisher.cxx", maintemplates.getTemplate("com/eprosima/fastdds/idl/templates/DDSPublisherSource.stg"), m_replace)) { - project.addProjectIncludeFile(relative_dir + ctx.getFilename() + "Publisher.h"); + project.addProjectIncludeFile(relative_dir + ctx.getFilename() + "Publisher.hpp"); project.addProjectSrcFile(relative_dir + ctx.getFilename() + "Publisher.cxx"); } } System.out.println("Generating Subscriber files..."); if (returnedValue = - Utils.writeFile(output_dir + ctx.getFilename() + "Subscriber.h", + Utils.writeFile(output_dir + ctx.getFilename() + "Subscriber.hpp", maintemplates.getTemplate("com/eprosima/fastdds/idl/templates/DDSSubscriberHeader.stg"), m_replace)) { if (returnedValue = Utils.writeFile(output_dir + ctx.getFilename() + "Subscriber.cxx", maintemplates.getTemplate("com/eprosima/fastdds/idl/templates/DDSSubscriberSource.stg"), m_replace)) { - project.addProjectIncludeFile(relative_dir + ctx.getFilename() + "Subscriber.h"); + project.addProjectIncludeFile(relative_dir + ctx.getFilename() + "Subscriber.hpp"); project.addProjectSrcFile(relative_dir + ctx.getFilename() + "Subscriber.cxx"); } } @@ -1103,11 +1103,11 @@ private Project parseIDL( } } - if (Utils.writeFile(output_dir + ctx.getFilename() + "PubSubJNII.h", + if (Utils.writeFile(output_dir + ctx.getFilename() + "PubSubJNII.hpp", maintemplates.getTemplate("JNIHeader"), m_replace)) { - project.addJniIncludeFile(relative_dir + ctx.getFilename() + "PubSubJNII.h"); + project.addJniIncludeFile(relative_dir + ctx.getFilename() + "PubSubJNII.hpp"); } else { @@ -1490,7 +1490,7 @@ boolean callJavah( String javafile = (m_outputDir != null ? m_outputDir : "") + (!m_package.isEmpty() ? m_package.replace('.', File.separatorChar) + File.separator : "") + Util.getIDLFileNameOnly(idlFilename) + "PubSub.java"; - String headerfile = m_outputDir + Util.getIDLFileNameOnly(idlFilename) + "PubSubJNI.h"; + String headerfile = m_outputDir + Util.getIDLFileNameOnly(idlFilename) + "PubSubJNI.hpp"; int exitVal = -1; String javac = null; String javah = null; diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubMain.stg b/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubMain.stg index 6fa4791f..300f355e 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubMain.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubMain.stg @@ -20,8 +20,8 @@ main(ctx, definitions) ::= << $fileHeader(ctx=ctx, file=[ctx.filename, "PubSubMain.cpp"], description=["This file acts as a main entry point to the application."])$ -#include "$ctx.filename$Publisher.h" -#include "$ctx.filename$Subscriber.h" +#include "$ctx.filename$Publisher.hpp" +#include "$ctx.filename$Subscriber.hpp" int main( int argc, diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeHeader.stg b/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeHeader.stg index 1278ee56..4d2149cd 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeHeader.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeHeader.stg @@ -17,21 +17,21 @@ group ProtocolHeader; import "eprosima.stg" main(ctx, definitions) ::= << -$fileHeader(ctx=ctx, file=[ctx.filename, "PubSubTypes.h"], description=["This header file contains the declaration of the serialization functions."])$ +$fileHeader(ctx=ctx, file=[ctx.filename, "PubSubTypes.hpp"], description=["This header file contains the declaration of the serialization functions."])$ -#ifndef _FAST_DDS_GENERATED_$ctx.headerGuardName$_PUBSUBTYPES_H_ -#define _FAST_DDS_GENERATED_$ctx.headerGuardName$_PUBSUBTYPES_H_ +#ifndef FAST_DDS_GENERATED__$ctx.headerGuardName$_PUBSUBTYPES_HPP +#define FAST_DDS_GENERATED__$ctx.headerGuardName$_PUBSUBTYPES_HPP #include #include -#include -#include -#include +#include +#include +#include #include "$ctx.filename$.hpp" -$ctx.directIncludeDependencies : {include | #include "$include$PubSubTypes.h"}; separator="\n"$ +$ctx.directIncludeDependencies : {include | #include "$include$PubSubTypes.hpp"}; separator="\n"$ #if !defined(GEN_API_VER) || (GEN_API_VER != 2) #error \ @@ -40,7 +40,7 @@ $ctx.directIncludeDependencies : {include | #include "$include$PubSubTypes.h"}; $definitions; separator="\n"$ -#endif // _FAST_DDS_GENERATED_$ctx.headerGuardName$_PUBSUBTYPES_H_ +#endif // FAST_DDS_GENERATED__$ctx.headerGuardName$_PUBSUBTYPES_HPP $"\n"$ >> @@ -165,10 +165,10 @@ public: } 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 { $if(struct.isPlain)$ - if(data_representation == eprosima::fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION) + if (data_representation == eprosima::fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION) { return is_plain_xcdrv2_impl(); } @@ -194,7 +194,7 @@ public: #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - MD5 m_md5; + eprosima::fastdds::MD5 m_md5; unsigned char* m_keyBuffer; $if(struct.isPlain)$ diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeSource.stg b/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeSource.stg index aa43c021..40509350 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeSource.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeSource.stg @@ -19,7 +19,7 @@ import "eprosima.stg" main(ctx, definitions) ::= << $fileHeader(ctx=ctx, file=[ctx.filename, "PubSubTypes.cpp"], description=["This header file contains the implementation of the serialization functions."])$ -#include "$ctx.filename$PubSubTypes.h" +#include "$ctx.filename$PubSubTypes.hpp" #include #include diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeSwigInterface.stg b/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeSwigInterface.stg index dffeb217..c8c4c575 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeSwigInterface.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeSwigInterface.stg @@ -22,11 +22,11 @@ $fileHeader(ctx=ctx, file=[ctx.filename, "PubSubTypes.i"], description=["This h %import(module="fastdds") "fastdds/dds/topic/TopicDataType.hpp"; %{ -#include "$ctx.filename$PubSubTypes.h" +#include "$ctx.filename$PubSubTypes.hpp" %} #define GEN_API_VER 2 -%include "$ctx.filename$PubSubTypes.h" +%include "$ctx.filename$PubSubTypes.hpp" >> diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/DDSPublisherHeader.stg b/src/main/java/com/eprosima/fastdds/idl/templates/DDSPublisherHeader.stg index 5f977aa0..80aa42b9 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/DDSPublisherHeader.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/DDSPublisherHeader.stg @@ -17,11 +17,11 @@ group ProtocolHeader; import "eprosima.stg" main(ctx, definitions) ::= << -$fileHeader(ctx=ctx, file=[ctx.filename, "Publisher.h"], description=["This header file contains the declaration of the publisher functions."])$ +$fileHeader(ctx=ctx, file=[ctx.filename, "Publisher.hpp"], description=["This header file contains the declaration of the publisher functions."])$ -#ifndef _FAST_DDS_GENERATED_$ctx.headerGuardName$_PUBLISHER_H_ -#define _FAST_DDS_GENERATED_$ctx.headerGuardName$_PUBLISHER_H_ +#ifndef FAST_DDS_GENERATED__$ctx.headerGuardName$_PUBLISHER_HPP +#define FAST_DDS_GENERATED__$ctx.headerGuardName$_PUBLISHER_HPP #include #include @@ -66,5 +66,5 @@ private: listener_; }; -#endif // _FAST_DDS_GENERATED_$ctx.headerGuardName$_PUBLISHER_H_ +#endif // FAST_DDS_GENERATED__$ctx.headerGuardName$_PUBLISHER_HPP >> diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/DDSPublisherSource.stg b/src/main/java/com/eprosima/fastdds/idl/templates/DDSPublisherSource.stg index 608adc80..6db74e6d 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/DDSPublisherSource.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/DDSPublisherSource.stg @@ -20,8 +20,8 @@ main(ctx, definitions) ::= << $fileHeader(ctx=ctx, file=[ctx.filename, "Publisher.cpp"], description=["This file contains the implementation of the publisher functions."])$ -#include "$ctx.filename$Publisher.h" -#include "$ctx.filename$PubSubTypes.h" +#include "$ctx.filename$Publisher.hpp" +#include "$ctx.filename$PubSubTypes.hpp" #include #include diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/DDSSubscriberHeader.stg b/src/main/java/com/eprosima/fastdds/idl/templates/DDSSubscriberHeader.stg index b06e55c2..f61263d5 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/DDSSubscriberHeader.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/DDSSubscriberHeader.stg @@ -17,11 +17,11 @@ group ProtocolHeader; import "eprosima.stg" main(ctx, definitions) ::= << -$fileHeader(ctx=ctx, file=[ctx.filename, "Subscriber.h"], description=["This header file contains the declaration of the subscriber functions."])$ +$fileHeader(ctx=ctx, file=[ctx.filename, "Subscriber.hpp"], description=["This header file contains the declaration of the subscriber functions."])$ -#ifndef _FAST_DDS_GENERATED_$ctx.headerGuardName$_SUBSCRIBER_H_ -#define _FAST_DDS_GENERATED_$ctx.headerGuardName$_SUBSCRIBER_H_ +#ifndef FAST_DDS_GENERATED__$ctx.headerGuardName$_SUBSCRIBER_HPP +#define FAST_DDS_GENERATED__$ctx.headerGuardName$_SUBSCRIBER_HPP #include #include @@ -69,5 +69,5 @@ private: listener_; }; -#endif // _FAST_DDS_GENERATED_$ctx.headerGuardName$_SUBSCRIBER_H_ +#endif // FAST_DDS_GENERATED__$ctx.headerGuardName$_SUBSCRIBER_HPP >> diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/DDSSubscriberSource.stg b/src/main/java/com/eprosima/fastdds/idl/templates/DDSSubscriberSource.stg index 00373e96..bc6b7243 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/DDSSubscriberSource.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/DDSSubscriberSource.stg @@ -25,8 +25,8 @@ $fileHeader(ctx=ctx, file=[ctx.filename, "Subscriber.cpp"], description=["This #include #include -#include "$ctx.filename$Subscriber.h" -#include "$ctx.filename$PubSubTypes.h" +#include "$ctx.filename$Subscriber.hpp" +#include "$ctx.filename$PubSubTypes.hpp" using namespace eprosima::fastdds::dds; diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/JNISource.stg b/src/main/java/com/eprosima/fastdds/idl/templates/JNISource.stg index b22548fc..21a66dcb 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/JNISource.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/JNISource.stg @@ -19,8 +19,8 @@ import "eprosima.stg" main(ctx, definitions) ::= << $fileHeader(ctx=ctx, file=[ctx.filename, "JNI.cxx"], description=[""])$ -$ctx.directIncludeDependencies : {include | #include "$include$PubSubJNII.h"}; separator="\n"$ -#include "$ctx.filename$PubSubJNII.h" +$ctx.directIncludeDependencies : {include | #include "$include$PubSubJNII.hpp"}; separator="\n"$ +#include "$ctx.filename$PubSubJNII.hpp" #include #include diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/SerializationHeader.stg b/src/main/java/com/eprosima/fastdds/idl/templates/SerializationHeader.stg index ac1ab5d4..784e63ee 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/SerializationHeader.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/SerializationHeader.stg @@ -17,10 +17,10 @@ group ProtocolHeader; import "eprosima.stg" main(ctx, definitions) ::= << -$fileHeader(ctx=ctx, file=[ctx.filename, "Serialization.h"], description=["This file contains serialization definitions."])$ +$fileHeader(ctx=ctx, file=[ctx.filename, "Serialization.hpp"], description=["This file contains serialization definitions."])$ -#ifndef _FAST_DDS_GENERATED_$ctx.headerGuardName$_SERIALIZATION_H_ -#define _FAST_DDS_GENERATED_$ctx.headerGuardName$_SERIALIZATION_H_ +#ifndef FAST_DDS_GENERATED__$ctx.headerGuardName$_SERIALIZATION_HPP +#define FAST_DDS_GENERATED__$ctx.headerGuardName$_SERIALIZATION_HPP #include "$ctx.filename$.hpp" @@ -29,7 +29,7 @@ $definitions; separator="\n"$ extern bool g_$ctx.filename$_test_null_opt; extern bool g_$ctx.filename$_test_empty_ext; -#endif //_FAST_DDS_GENERATED_$ctx.headerGuardName$_SERIALIZATION_H_ +#endif //FAST_DDS_GENERATED__$ctx.headerGuardName$_SERIALIZATION_HPP >> struct_type(ctx, parent, struct, member_list) ::= << diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/SerializationSource.stg b/src/main/java/com/eprosima/fastdds/idl/templates/SerializationSource.stg index ec4cb768..68d93761 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/SerializationSource.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/SerializationSource.stg @@ -19,7 +19,7 @@ import "eprosima.stg" main(ctx, definitions) ::= << $fileHeader(ctx=ctx, file=[ctx.filename, "SerializationSource.cpp"], description=["This file contains serialization code."])$ -#include "$ctx.filename$Serialization.h" +#include "$ctx.filename$Serialization.hpp" #include #include @@ -34,7 +34,7 @@ $fileHeader(ctx=ctx, file=[ctx.filename, "SerializationSource.cpp"], descriptio bool g_$ctx.filename$_test_null_opt = false; bool g_$ctx.filename$_test_empty_ext = false; -$ctx.directIncludeDependencies:{ header | #include "$header$Serialization.h"}; separator="\n"$ +$ctx.directIncludeDependencies:{ header | #include "$header$Serialization.hpp"}; separator="\n"$ $definitions; separator="\n"$ diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/SerializationTestSource.stg b/src/main/java/com/eprosima/fastdds/idl/templates/SerializationTestSource.stg index ebed4f7b..295e0e14 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/SerializationTestSource.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/SerializationTestSource.stg @@ -28,10 +28,10 @@ $fileHeader(ctx=ctx, file=[ctx.filename, "SerializationTest.cpp"], description= #include -#include "$ctx.filename$PubSubTypes.h" -#include "$ctx.filename$Serialization.h" +#include "$ctx.filename$PubSubTypes.hpp" +#include "$ctx.filename$Serialization.hpp" #include -#include +#include $definitions; separator="\n"$ diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/TypeObjectTestingTestSource.stg b/src/main/java/com/eprosima/fastdds/idl/templates/TypeObjectTestingTestSource.stg index 627e9a69..1df6c1a6 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/TypeObjectTestingTestSource.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/TypeObjectTestingTestSource.stg @@ -50,7 +50,7 @@ bool eprosima::fastcdr::external #include #include #include -#include +#include #include $ctx.directIncludeDependencies : {include | #include "$include$.hpp"}; separator="\n"$ diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeader.stg b/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeader.stg index 29bca63c..06a86273 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeader.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeader.stg @@ -19,8 +19,8 @@ import "eprosima.stg" main(ctx, definitions, extensions) ::= << $fileHeader(ctx=ctx, file=[ctx.filename, "CdrAux.hpp"], description=["This source file contains some definitions of CDR related functions."])$ -#ifndef _FAST_DDS_GENERATED_$ctx.headerGuardName$CDRAUX_HPP_ -#define _FAST_DDS_GENERATED_$ctx.headerGuardName$CDRAUX_HPP_ +#ifndef FAST_DDS_GENERATED__$ctx.headerGuardName$CDRAUX_HPP +#define FAST_DDS_GENERATED__$ctx.headerGuardName$CDRAUX_HPP #include "$ctx.filename$.hpp" @@ -43,7 +43,7 @@ $definitions; separator="\n"$ } // namespace fastcdr } // namespace eprosima -#endif // _FAST_DDS_GENERATED_$ctx.headerGuardName$CDRAUX_HPP_ +#endif // FAST_DDS_GENERATED__$ctx.headerGuardName$CDRAUX_HPP $"\n"$ >> diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg b/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg index 5828cefe..3ae2ec4d 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg @@ -20,8 +20,8 @@ import "com/eprosima/fastcdr/idl/templates/FastCdrCommon.stg" main(ctx, definitions, extensions) ::= << $fileHeader(ctx=ctx, file=[ctx.filename, "CdrAux.ipp"], description=["This source file contains some declarations of CDR related functions."])$ -#ifndef _FAST_DDS_GENERATED_$ctx.headerGuardName$CDRAUX_IPP_ -#define _FAST_DDS_GENERATED_$ctx.headerGuardName$CDRAUX_IPP_ +#ifndef FAST_DDS_GENERATED__$ctx.headerGuardName$CDRAUX_IPP +#define FAST_DDS_GENERATED__$ctx.headerGuardName$CDRAUX_IPP #include "$ctx.filename$CdrAux.hpp" @@ -42,7 +42,7 @@ $definitions; separator="\n"$ } // namespace fastcdr } // namespace eprosima -#endif // _FAST_DDS_GENERATED_$ctx.headerGuardName$CDRAUX_IPP_ +#endif // FAST_DDS_GENERATED__$ctx.headerGuardName$CDRAUX_IPP $"\n"$ >> diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectHeader.stg b/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectHeader.stg index dbdb1346..5ad5c698 100644 --- a/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectHeader.stg +++ b/src/main/java/com/eprosima/fastdds/idl/templates/XTypesTypeObjectHeader.stg @@ -19,8 +19,8 @@ import "eprosima.stg" main(ctx, definitions) ::= << $fileHeader(ctx=ctx, file=[ctx.filename, "TypeObjectSupport.hpp"], description=["Header file containing the API required to register the TypeObject representation of the described types in the IDL file"])$ -#ifndef _FAST_DDS_GENERATED_$ctx.headerGuardName$_TYPE_OBJECT_SUPPORT_HPP_ -#define _FAST_DDS_GENERATED_$ctx.headerGuardName$_TYPE_OBJECT_SUPPORT_HPP_ +#ifndef FAST_DDS_GENERATED__$ctx.headerGuardName$_TYPE_OBJECT_SUPPORT_HPP +#define FAST_DDS_GENERATED__$ctx.headerGuardName$_TYPE_OBJECT_SUPPORT_HPP #include @@ -42,7 +42,7 @@ $definitions; separator=""$ #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC -#endif // _FAST_DDS_GENERATED_$ctx.headerGuardName$_TYPE_OBJECT_SUPPORT_HPP_ +#endif // FAST_DDS_GENERATED__$ctx.headerGuardName$_TYPE_OBJECT_SUPPORT_HPP >>