Skip to content

Commit ab6db3d

Browse files
committed
Refs #21128: Update mock's guards and .h to .hpp
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
1 parent 4d64f4e commit ab6db3d

34 files changed

Lines changed: 197 additions & 124 deletions

File tree

test/mock/dds/DomainParticipantFactory/fastdds/dds/domain/DomainParticipantFactory.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
*
1818
*/
1919

20-
#ifndef _FASTDDS_DDS_DOMAIN_DOMAINPARTICIPANT_FACTORY_HPP_
21-
#define _FASTDDS_DDS_DOMAIN_DOMAINPARTICIPANT_FACTORY_HPP_
20+
#ifndef FASTDDS_DDS_DOMAIN__DOMAINPARTICIPANTFACTORY_HPP
21+
#define FASTDDS_DDS_DOMAIN__DOMAINPARTICIPANTFACTORY_HPP
2222

2323
#include <memory>
2424

@@ -66,4 +66,4 @@ class DomainParticipantFactory
6666
} // namespace fastdds
6767
} // namespace eprosima
6868

69-
#endif /* _FASTDDS_DDS_DOMAIN_DOMAINPARTICIPANT_FACTORY_HPP_*/
69+
#endif // FASTDDS_DDS_DOMAIN__DOMAINPARTICIPANTFACTORY_HPP

test/mock/dds/QosPolicies/fastdds/dds/core/policy/QosPolicies.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
// limitations under the License.
1414

1515
/**
16-
* @file QosPolicies.h
16+
* @file QosPolicies.hpp
1717
*
1818
*/
1919

20-
#ifndef _FASTDDS_DDS_QOS_QOSPOLICIES_HPP_
21-
#define _FASTDDS_DDS_QOS_QOSPOLICIES_HPP_
20+
#ifndef FASTDDS_DDS_CORE_POLICY__QOSPOLICIES_HPP
21+
#define FASTDDS_DDS_CORE_POLICY__QOSPOLICIES_HPP
2222

2323
#include <bitset>
2424
#include <vector>
@@ -1615,4 +1615,4 @@ class TypeInformationParameter : public Parameter_t, public QosPolicy
16151615
} //namespace fastdds
16161616
} //namespace eprosima
16171617

1618-
#endif // _FASTDDS_DDS_QOS_QOSPOLICIES_HPP_
1618+
#endif // FASTDDS_DDS_CORE_POLICY__QOSPOLICIES_HPP

test/mock/dds/Topic/fastdds/dds/topic/Topic.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* @file Topic.hpp
1717
*/
1818

19-
#ifndef _FASTDDS_TOPIC_HPP_
20-
#define _FASTDDS_TOPIC_HPP_
19+
#ifndef FASTDDS_DDS_TOPIC__TOPIC_HPP
20+
#define FASTDDS_DDS_TOPIC__TOPIC_HPP
2121

2222
#include <fastdds/dds/core/Entity.hpp>
2323
#include <fastdds/dds/core/status/BaseStatus.hpp>
@@ -50,4 +50,4 @@ class Topic : public TopicDescription
5050
} // namespace fastdds
5151
} // namespace eprosima
5252

53-
#endif // _FASTDDS_TOPIC_HPP_
53+
#endif // FASTDDS_DDS_TOPIC__TOPIC_HPP

test/mock/dds/TypeObjectUtils/fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
// limitations under the License.
1414

1515
/*!
16-
* @file
16+
* @file TypeObjectUtils.hpp
1717
* This file contains static functions to help build a TypeObject.
1818
*/
1919

20-
#ifndef _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTUTILS_HPP_
21-
#define _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTUTILS_HPP_
20+
#ifndef FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTUTILS_HPP
21+
#define FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTUTILS_HPP
2222

2323
#include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
2424

@@ -50,9 +50,9 @@ class TypeObjectUtils
5050

5151
};
5252

53-
} // xtypes
54-
} // dds
55-
} // fastdds
56-
} // eprosima
53+
} // namespace xtypes
54+
} // namespace dds
55+
} // namespace fastdds
56+
} // namespace eprosima
5757

58-
#endif // _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTUTILS_HPP_
58+
#endif // FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTUTILS_HPP

test/mock/dds/TypeSupport/fastdds/dds/topic/TypeSupport.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* @file TypeSupport.hpp
1717
*/
1818

19-
#ifndef _FASTDDS_TYPE_SUPPORT_HPP_
20-
#define _FASTDDS_TYPE_SUPPORT_HPP_
19+
#ifndef FASTDDS_DDS_TOPIC__TYPESUPPORT_HPP
20+
#define FASTDDS_DDS_TOPIC__TYPESUPPORT_HPP
2121

2222
#include <fastdds/dds/topic/TopicDataType.hpp>
2323

@@ -43,4 +43,4 @@ class TypeSupport : public std::shared_ptr<fastdds::dds::TopicDataType>
4343
} // namespace fastdds
4444
} // namespace eprosima
4545

46-
#endif // _FASTDDS_TYPE_SUPPORT_HPP_
46+
#endif // FASTDDS_DDS_TOPIC__TYPESUPPORT_HPP

test/mock/rtps/BuiltinProtocols/rtps/builtin/BuiltinProtocols.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
/**
16-
* @file BiultinProtocols.h
16+
* @file BuiltinProtocols.h
1717
*/
1818

1919
#ifndef _FASTDDS_RTPS_BUILTINPROTOCOLS_H_
@@ -70,4 +70,4 @@ class BuiltinProtocols
7070
} // namespace fastdds
7171
} // namespace eprosima
7272

73-
#endif // _FASTDDS_RTPS_ENDPOINT_H_
73+
#endif // _FASTDDS_RTPS_BUILTINPROTOCOLS_H_

test/mock/rtps/DataSharingPayloadPool/rtps/DataSharing/DataSharingPayloadPool.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* @file DataSharingPayloadPool.hpp
1717
*/
1818

19-
#ifndef RTPS_HISTORY_DATASHARINGPAYLOADPOOL_HPP
20-
#define RTPS_HISTORY_DATASHARINGPAYLOADPOOL_HPP
19+
#ifndef RTPS_DATASHARING_DATASHARINGPAYLOADPOOL_HPP
20+
#define RTPS_DATASHARING_DATASHARINGPAYLOADPOOL_HPP
2121

2222
#include <fastdds/rtps/common/CacheChange.hpp>
2323
#include <fastdds/rtps/history/IPayloadPool.hpp>
@@ -165,4 +165,4 @@ class DataSharingPayloadPool : public IPayloadPool
165165
} // namespace fastdds
166166
} // namespace eprosima
167167

168-
#endif // RTPS_HISTORY_DATASHARINGPAYLOADPOOL_HPP
168+
#endif // RTPS_DATASHARING_DATASHARINGPAYLOADPOOL_HPP

test/mock/rtps/Endpoint/fastdds/rtps/Endpoint.h renamed to test/mock/rtps/Endpoint/fastdds/rtps/Endpoint.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
// limitations under the License.
1414

1515
/**
16-
* @file Endpoint.h
16+
* @file Endpoint.hpp
1717
*/
1818

19-
#ifndef _FASTDDS_RTPS_ENDPOINT_H_
20-
#define _FASTDDS_RTPS_ENDPOINT_H_
19+
#ifndef FASTDDS_RTPS__ENDPOINT_HPP
20+
#define FASTDDS_RTPS__ENDPOINT_HPP
2121

2222
#include <fastdds/utils/TimedMutex.hpp>
2323
#include <fastdds/rtps/attributes/EndpointAttributes.hpp>
@@ -64,4 +64,4 @@ class Endpoint
6464
} // namespace fastdds
6565
} // namespace eprosima
6666

67-
#endif // _FASTDDS_RTPS_ENDPOINT_H_
67+
#endif // FASTDDS_RTPS__ENDPOINT_HPP

test/mock/rtps/Log/fastdds/dds/log/FileConsumer.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
// limitations under the License.
1414

1515
/**
16-
* @file FileConsumer.h
16+
* @file FileConsumer.hpp
1717
*
1818
*/
1919

20-
#ifndef _FASTDDS_DDS_LOG_FILECONSUMER_HPP_
21-
#define _FASTDDS_DDS_LOG_FILECONSUMER_HPP_
20+
#ifndef FASTDDS_DDS_LOG__FILECONSUMER_HPP
21+
#define FASTDDS_DDS_LOG__FILECONSUMER_HPP
2222

2323
#include <gmock/gmock.h>
2424

@@ -54,4 +54,4 @@ MATCHER(IsFileConsumer, "Argument is a FileConsumer object?")
5454
} // namespace fastdds
5555
} // namespace eprosima
5656

57-
#endif // _FASTDDS_DDS_LOG_FILECONSUMER_HPP_
57+
#endif // FASTDDS_DDS_LOG__FILECONSUMER_HPP

test/mock/rtps/Log/fastdds/dds/log/Log.hpp

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@
1212
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
// See the License for the specific language governing permissions and
1414
// limitations under the License.
15-
//
16-
#ifndef _FASTDDS_DDS_LOG_LOG_HPP_
17-
#define _FASTDDS_DDS_LOG_LOG_HPP_
15+
16+
/**
17+
* @file Log.hpp
18+
*
19+
*/
20+
21+
#ifndef FASTDDS_DDS_LOG__LOG_HPP
22+
#define FASTDDS_DDS_LOG__LOG_HPP
1823

1924
#include <functional>
2025
#include <memory>
@@ -118,4 +123,4 @@ class LogMock
118123
} // namespace fastdds
119124
} // namespace eprosima
120125

121-
#endif // _FASTDDS_DDS_LOG_LOG_HPP_
126+
#endif // FASTDDS_DDS_LOG__LOG_HPP

0 commit comments

Comments
 (0)