Skip to content

Commit 11f0a61

Browse files
JesusPoderosoJesusPoderoso
committed
Refs #21128: Update guards and .h to .hpp
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
1 parent ac2d6d6 commit 11f0a61

16 files changed

Lines changed: 56 additions & 56 deletions

‎src/main/java/com/eprosima/fastdds/fastddsgen.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ private Project parseIDL(
943943
project.addCommonTestingFile(relative_dir + ctx.getFilename() + "Serialization.cpp");
944944

945945
System.out.println("Generating Serialization Header file...");
946-
String fileNameH = output_dir + ctx.getFilename() + "Serialization.h";
946+
String fileNameH = output_dir + ctx.getFilename() + "Serialization.hpp";
947947
returnedValue =
948948
Utils.writeFile(fileNameH, maintemplates.getTemplate("com/eprosima/fastdds/idl/templates/SerializationHeader.stg"), m_replace);
949949

@@ -993,9 +993,9 @@ private Project parseIDL(
993993
}
994994
}
995995
returnedValue &=
996-
Utils.writeFile(output_dir + ctx.getFilename() + "PubSubTypes.h",
996+
Utils.writeFile(output_dir + ctx.getFilename() + "PubSubTypes.hpp",
997997
maintemplates.getTemplate("com/eprosima/fastdds/idl/templates/DDSPubSubTypeHeader.stg"), m_replace);
998-
project.addCommonIncludeFile(relative_dir + ctx.getFilename() + "PubSubTypes.h");
998+
project.addCommonIncludeFile(relative_dir + ctx.getFilename() + "PubSubTypes.hpp");
999999
if (ctx.existsLastStructure())
10001000
{
10011001
m_atLeastOneStructure = true;
@@ -1019,28 +1019,28 @@ private Project parseIDL(
10191019
{
10201020
System.out.println("Generating Publisher files...");
10211021
if (returnedValue =
1022-
Utils.writeFile(output_dir + ctx.getFilename() + "Publisher.h",
1022+
Utils.writeFile(output_dir + ctx.getFilename() + "Publisher.hpp",
10231023
maintemplates.getTemplate("com/eprosima/fastdds/idl/templates/DDSPublisherHeader.stg"), m_replace))
10241024
{
10251025
if (returnedValue =
10261026
Utils.writeFile(output_dir + ctx.getFilename() + "Publisher.cxx",
10271027
maintemplates.getTemplate("com/eprosima/fastdds/idl/templates/DDSPublisherSource.stg"), m_replace))
10281028
{
1029-
project.addProjectIncludeFile(relative_dir + ctx.getFilename() + "Publisher.h");
1029+
project.addProjectIncludeFile(relative_dir + ctx.getFilename() + "Publisher.hpp");
10301030
project.addProjectSrcFile(relative_dir + ctx.getFilename() + "Publisher.cxx");
10311031
}
10321032
}
10331033

10341034
System.out.println("Generating Subscriber files...");
10351035
if (returnedValue =
1036-
Utils.writeFile(output_dir + ctx.getFilename() + "Subscriber.h",
1036+
Utils.writeFile(output_dir + ctx.getFilename() + "Subscriber.hpp",
10371037
maintemplates.getTemplate("com/eprosima/fastdds/idl/templates/DDSSubscriberHeader.stg"), m_replace))
10381038
{
10391039
if (returnedValue =
10401040
Utils.writeFile(output_dir + ctx.getFilename() + "Subscriber.cxx",
10411041
maintemplates.getTemplate("com/eprosima/fastdds/idl/templates/DDSSubscriberSource.stg"), m_replace))
10421042
{
1043-
project.addProjectIncludeFile(relative_dir + ctx.getFilename() + "Subscriber.h");
1043+
project.addProjectIncludeFile(relative_dir + ctx.getFilename() + "Subscriber.hpp");
10441044
project.addProjectSrcFile(relative_dir + ctx.getFilename() + "Subscriber.cxx");
10451045
}
10461046
}
@@ -1103,11 +1103,11 @@ private Project parseIDL(
11031103
}
11041104
}
11051105

1106-
if (Utils.writeFile(output_dir + ctx.getFilename() + "PubSubJNII.h",
1106+
if (Utils.writeFile(output_dir + ctx.getFilename() + "PubSubJNII.hpp",
11071107
maintemplates.getTemplate("JNIHeader"),
11081108
m_replace))
11091109
{
1110-
project.addJniIncludeFile(relative_dir + ctx.getFilename() + "PubSubJNII.h");
1110+
project.addJniIncludeFile(relative_dir + ctx.getFilename() + "PubSubJNII.hpp");
11111111
}
11121112
else
11131113
{
@@ -1490,7 +1490,7 @@ boolean callJavah(
14901490
String javafile = (m_outputDir != null ? m_outputDir : "") +
14911491
(!m_package.isEmpty() ? m_package.replace('.', File.separatorChar) + File.separator : "") +
14921492
Util.getIDLFileNameOnly(idlFilename) + "PubSub.java";
1493-
String headerfile = m_outputDir + Util.getIDLFileNameOnly(idlFilename) + "PubSubJNI.h";
1493+
String headerfile = m_outputDir + Util.getIDLFileNameOnly(idlFilename) + "PubSubJNI.hpp";
14941494
int exitVal = -1;
14951495
String javac = null;
14961496
String javah = null;

‎src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubMain.stg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ main(ctx, definitions) ::= <<
2020
$fileHeader(ctx=ctx, file=[ctx.filename, "PubSubMain.cpp"], description=["This file acts as a main entry point to the application."])$
2121

2222

23-
#include "$ctx.filename$Publisher.h"
24-
#include "$ctx.filename$Subscriber.h"
23+
#include "$ctx.filename$Publisher.hpp"
24+
#include "$ctx.filename$Subscriber.hpp"
2525

2626
int main(
2727
int argc,

‎src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeHeader.stg‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@ group ProtocolHeader;
1717
import "eprosima.stg"
1818

1919
main(ctx, definitions) ::= <<
20-
$fileHeader(ctx=ctx, file=[ctx.filename, "PubSubTypes.h"], description=["This header file contains the declaration of the serialization functions."])$
20+
$fileHeader(ctx=ctx, file=[ctx.filename, "PubSubTypes.hpp"], description=["This header file contains the declaration of the serialization functions."])$
2121

2222

23-
#ifndef _FAST_DDS_GENERATED_$ctx.headerGuardName$_PUBSUBTYPES_H_
24-
#define _FAST_DDS_GENERATED_$ctx.headerGuardName$_PUBSUBTYPES_H_
23+
#ifndef FAST_DDS_GENERATED__$ctx.headerGuardName$_PUBSUBTYPES_HPP
24+
#define FAST_DDS_GENERATED__$ctx.headerGuardName$_PUBSUBTYPES_HPP
2525

2626
#include <fastdds/dds/core/policy/QosPolicies.hpp>
2727
#include <fastdds/dds/topic/TopicDataType.hpp>
28-
#include <fastdds/rtps/common/InstanceHandle.h>
29-
#include <fastdds/rtps/common/SerializedPayload.h>
30-
#include <fastdds/utils/md5.h>
28+
#include <fastdds/rtps/common/InstanceHandle.hpp>
29+
#include <fastdds/rtps/common/SerializedPayload.hpp>
30+
#include <fastdds/utils/md5.hpp>
3131

3232
#include "$ctx.filename$.hpp"
3333

34-
$ctx.directIncludeDependencies : {include | #include "$include$PubSubTypes.h"}; separator="\n"$
34+
$ctx.directIncludeDependencies : {include | #include "$include$PubSubTypes.hpp"}; separator="\n"$
3535

3636
#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
3737
#error \
@@ -40,7 +40,7 @@ $ctx.directIncludeDependencies : {include | #include "$include$PubSubTypes.h"};
4040

4141
$definitions; separator="\n"$
4242

43-
#endif // _FAST_DDS_GENERATED_$ctx.headerGuardName$_PUBSUBTYPES_H_
43+
#endif // FAST_DDS_GENERATED__$ctx.headerGuardName$_PUBSUBTYPES_HPP
4444
$"\n"$
4545
>>
4646

@@ -194,7 +194,7 @@ public:
194194

195195
#endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
196196

197-
MD5 m_md5;
197+
eprosima::fastdds::MD5 m_md5;
198198
unsigned char* m_keyBuffer;
199199

200200
$if(struct.isPlain)$

‎src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeSource.stg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import "eprosima.stg"
1919
main(ctx, definitions) ::= <<
2020
$fileHeader(ctx=ctx, file=[ctx.filename, "PubSubTypes.cpp"], description=["This header file contains the implementation of the serialization functions."])$
2121

22-
#include "$ctx.filename$PubSubTypes.h"
22+
#include "$ctx.filename$PubSubTypes.hpp"
2323

2424
#include <fastdds/dds/log/Log.hpp>
2525
#include <fastdds/rtps/common/CdrSerialization.hpp>

‎src/main/java/com/eprosima/fastdds/idl/templates/DDSPubSubTypeSwigInterface.stg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ $fileHeader(ctx=ctx, file=[ctx.filename, "PubSubTypes.i"], description=["This h
2222
%import(module="fastdds") "fastdds/dds/topic/TopicDataType.hpp";
2323

2424
%{
25-
#include "$ctx.filename$PubSubTypes.h"
25+
#include "$ctx.filename$PubSubTypes.hpp"
2626
%}
2727

2828
#define GEN_API_VER 2
2929

30-
%include "$ctx.filename$PubSubTypes.h"
30+
%include "$ctx.filename$PubSubTypes.hpp"
3131

3232
>>

‎src/main/java/com/eprosima/fastdds/idl/templates/DDSPublisherHeader.stg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ group ProtocolHeader;
1717
import "eprosima.stg"
1818

1919
main(ctx, definitions) ::= <<
20-
$fileHeader(ctx=ctx, file=[ctx.filename, "Publisher.h"], description=["This header file contains the declaration of the publisher functions."])$
20+
$fileHeader(ctx=ctx, file=[ctx.filename, "Publisher.hpp"], description=["This header file contains the declaration of the publisher functions."])$
2121

2222

23-
#ifndef _FAST_DDS_GENERATED_$ctx.headerGuardName$_PUBLISHER_H_
24-
#define _FAST_DDS_GENERATED_$ctx.headerGuardName$_PUBLISHER_H_
23+
#ifndef FAST_DDS_GENERATED__$ctx.headerGuardName$_PUBLISHER_HPP
24+
#define FAST_DDS_GENERATED__$ctx.headerGuardName$_PUBLISHER_HPP
2525

2626
#include <fastdds/dds/domain/DomainParticipant.hpp>
2727
#include <fastdds/dds/publisher/DataWriter.hpp>
@@ -66,5 +66,5 @@ private:
6666
listener_;
6767
};
6868

69-
#endif // _FAST_DDS_GENERATED_$ctx.headerGuardName$_PUBLISHER_H_
69+
#endif // FAST_DDS_GENERATED__$ctx.headerGuardName$_PUBLISHER_HPP
7070
>>

‎src/main/java/com/eprosima/fastdds/idl/templates/DDSPublisherSource.stg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ main(ctx, definitions) ::= <<
2020
$fileHeader(ctx=ctx, file=[ctx.filename, "Publisher.cpp"], description=["This file contains the implementation of the publisher functions."])$
2121

2222

23-
#include "$ctx.filename$Publisher.h"
24-
#include "$ctx.filename$PubSubTypes.h"
23+
#include "$ctx.filename$Publisher.hpp"
24+
#include "$ctx.filename$PubSubTypes.hpp"
2525

2626
#include <fastdds/dds/domain/DomainParticipantFactory.hpp>
2727
#include <fastdds/dds/publisher/Publisher.hpp>

‎src/main/java/com/eprosima/fastdds/idl/templates/DDSSubscriberHeader.stg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ group ProtocolHeader;
1717
import "eprosima.stg"
1818

1919
main(ctx, definitions) ::= <<
20-
$fileHeader(ctx=ctx, file=[ctx.filename, "Subscriber.h"], description=["This header file contains the declaration of the subscriber functions."])$
20+
$fileHeader(ctx=ctx, file=[ctx.filename, "Subscriber.hpp"], description=["This header file contains the declaration of the subscriber functions."])$
2121

2222

23-
#ifndef _FAST_DDS_GENERATED_$ctx.headerGuardName$_SUBSCRIBER_H_
24-
#define _FAST_DDS_GENERATED_$ctx.headerGuardName$_SUBSCRIBER_H_
23+
#ifndef FAST_DDS_GENERATED__$ctx.headerGuardName$_SUBSCRIBER_HPP
24+
#define FAST_DDS_GENERATED__$ctx.headerGuardName$_SUBSCRIBER_HPP
2525

2626
#include <fastdds/dds/domain/DomainParticipant.hpp>
2727
#include <fastdds/dds/subscriber/DataReader.hpp>
@@ -69,5 +69,5 @@ private:
6969
listener_;
7070
};
7171

72-
#endif // _FAST_DDS_GENERATED_$ctx.headerGuardName$_SUBSCRIBER_H_
72+
#endif // FAST_DDS_GENERATED__$ctx.headerGuardName$_SUBSCRIBER_HPP
7373
>>

‎src/main/java/com/eprosima/fastdds/idl/templates/DDSSubscriberSource.stg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ $fileHeader(ctx=ctx, file=[ctx.filename, "Subscriber.cpp"], description=["This
2525
#include <fastdds/dds/subscriber/Subscriber.hpp>
2626
#include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
2727

28-
#include "$ctx.filename$Subscriber.h"
29-
#include "$ctx.filename$PubSubTypes.h"
28+
#include "$ctx.filename$Subscriber.hpp"
29+
#include "$ctx.filename$PubSubTypes.hpp"
3030

3131
using namespace eprosima::fastdds::dds;
3232

‎src/main/java/com/eprosima/fastdds/idl/templates/JNISource.stg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import "eprosima.stg"
1919
main(ctx, definitions) ::= <<
2020
$fileHeader(ctx=ctx, file=[ctx.filename, "JNI.cxx"], description=[""])$
2121

22-
$ctx.directIncludeDependencies : {include | #include "$include$PubSubJNII.h"}; separator="\n"$
23-
#include "$ctx.filename$PubSubJNII.h"
22+
$ctx.directIncludeDependencies : {include | #include "$include$PubSubJNII.hpp"}; separator="\n"$
23+
#include "$ctx.filename$PubSubJNII.hpp"
2424

2525
#include <fastrtps/participant/Participant.h>
2626
#include <fastrtps/attributes/ParticipantAttributes.h>

0 commit comments

Comments
 (0)