Skip to content

Commit 8f4058b

Browse files
EduPonzEduPonz
authored
Remove include/fastrtps (#4930)
* Refs #21159: Remove LibrarySettingsAttributes.h Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21159: Remove include/fastrtps/common Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21159: Remove ParameterTypes.h Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21159: Remove QosPolicies.h Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21159: Move doxygen_modules.h Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21159: Apply Eliana's suggestions Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21159: Remove installation of include/fastrtps Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21159: Correct CacheChange_t forward declaration Signed-off-by: eduponz <eduardoponz@eprosima.com> --------- Signed-off-by: eduponz <eduardoponz@eprosima.com>
1 parent 5cc3dc3 commit 8f4058b

69 files changed

Lines changed: 899 additions & 1165 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎examples/cpp/dds/RequestReplyExample/CalculatorClient.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@
1616
#include <mutex>
1717
#include <vector>
1818

19+
#include "CalculatorPubSubTypes.h"
20+
1921
#include <fastdds/dds/domain/DomainParticipant.hpp>
2022
#include <fastdds/dds/domain/DomainParticipantFactory.hpp>
2123
#include <fastdds/dds/publisher/DataWriter.hpp>
2224
#include <fastdds/dds/publisher/Publisher.hpp>
2325
#include <fastdds/dds/subscriber/DataReader.hpp>
2426
#include <fastdds/dds/subscriber/SampleInfo.hpp>
2527
#include <fastdds/dds/subscriber/Subscriber.hpp>
26-
27-
#include "CalculatorPubSubTypes.h"
28+
#include <fastdds/rtps/common/WriteParams.h>
2829

2930
class CalculatorClient
3031
{

‎examples/cpp/dds/RequestReplyExample/CalculatorServer.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@
1616
#include <mutex>
1717
#include <vector>
1818

19+
#include "CalculatorPubSubTypes.h"
20+
1921
#include <fastdds/dds/domain/DomainParticipant.hpp>
2022
#include <fastdds/dds/domain/DomainParticipantFactory.hpp>
2123
#include <fastdds/dds/publisher/DataWriter.hpp>
2224
#include <fastdds/dds/publisher/Publisher.hpp>
2325
#include <fastdds/dds/subscriber/DataReader.hpp>
2426
#include <fastdds/dds/subscriber/SampleInfo.hpp>
2527
#include <fastdds/dds/subscriber/Subscriber.hpp>
26-
27-
#include "CalculatorPubSubTypes.h"
28+
#include <fastdds/rtps/common/WriteParams.h>
2829

2930
class CalculatorServer
3031
{

include/fastrtps/config/doxygen_modules.h renamed to include/fastdds/config/doxygen_modules.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 doxygen_modules.h
16+
* @file doxygen_modules.hpp
1717
*/
1818

19-
#ifndef RTPS_DOXYGEN_MODULES_H_
20-
#define RTPS_DOXYGEN_MODULES_H_
19+
#ifndef _FASTDDS_DOXYGEN_MODULES_HPP_
20+
#define _FASTDDS_DOXYGEN_MODULES_HPP_
2121

2222
//Description of doxygen modules, not used in actual code.
2323

@@ -141,4 +141,4 @@
141141
* @ingroup UTILITIES_MODULE
142142
*/
143143

144-
#endif /* RTPS_DOXYGEN_MODULES_H_ */
144+
#endif /* _FASTDDS_DOXYGEN_MODULES_HPP_ */

‎include/fastdds/dds/core/policy/ParameterTypes.hpp‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1863,6 +1863,36 @@ T get_proxy_property(
18631863
}
18641864

18651865
} //namespace dds
1866+
1867+
namespace rtps {
1868+
1869+
using ParameterId_t = fastdds::dds::ParameterId_t;
1870+
using Parameter_t = fastdds::dds::Parameter_t;
1871+
using ParameterKey_t = fastdds::dds::ParameterKey_t;
1872+
using ParameterLocator_t = fastdds::dds::ParameterLocator_t;
1873+
using ParameterString_t = fastdds::dds::ParameterString_t;
1874+
using ParameterPort_t = fastdds::dds::ParameterPort_t;
1875+
using ParameterGuid_t = fastdds::dds::ParameterGuid_t;
1876+
using ParameterDomainId_t = fastdds::dds::ParameterDomainId_t;
1877+
using ParameterProtocolVersion_t = fastdds::dds::ParameterProtocolVersion_t;
1878+
using ParameterVendorId_t = fastdds::dds::ParameterVendorId_t;
1879+
using ParameterIP4Address_t = fastdds::dds::ParameterIP4Address_t;
1880+
using ParameterBool_t = fastdds::dds::ParameterBool_t;
1881+
using ParameterStatusInfo_t = fastdds::dds::ParameterStatusInfo_t;
1882+
using ParameterCount_t = fastdds::dds::ParameterCount_t;
1883+
using ParameterEntityId_t = fastdds::dds::ParameterEntityId_t;
1884+
using ParameterTime_t = fastdds::dds::ParameterTime_t;
1885+
using ParameterBuiltinEndpointSet_t = fastdds::dds::ParameterBuiltinEndpointSet_t;
1886+
using ParameterNetworkConfigSet_t = fastdds::dds::ParameterNetworkConfigSet_t;
1887+
using ParameterPropertyList_t = fastdds::dds::ParameterPropertyList_t;
1888+
using ParameterSampleIdentity_t = fastdds::dds::ParameterSampleIdentity_t;
1889+
#if HAVE_SECURITY
1890+
using ParameterToken_t = fastdds::dds::ParameterToken_t;
1891+
using ParameterParticipantSecurityInfo_t = fastdds::dds::ParameterParticipantSecurityInfo_t;
1892+
using ParameterEndpointSecurityInfo_t = fastdds::dds::ParameterEndpointSecurityInfo_t;
1893+
#endif // if HAVE_SECURITY
1894+
1895+
} //namespace rtps
18661896
} //namespace fastdds
18671897
} //namespace eprosima
18681898

‎include/fastdds/dds/publisher/Publisher.hpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ namespace fastdds {
4040

4141
class TopicAttributes;
4242

43+
namespace rtps {
44+
45+
class IPayloadPool;
46+
47+
} // namespace rtps
48+
4349
namespace dds {
4450

4551
class DomainParticipant;

‎include/fastdds/dds/subscriber/Subscriber.hpp‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,12 @@ namespace fastdds {
4343

4444
class TopicAttributes;
4545

46-
} // namespace fastdds
46+
namespace rtps {
47+
48+
class IPayloadPool;
49+
50+
} // namespace rtps
4751

48-
namespace fastdds {
4952
namespace dds {
5053

5154
class DomainParticipant;

‎include/fastdds/rtps/attributes/TopicAttributes.h‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616
* @file TopicAttributes.h
1717
*/
1818

19-
#ifndef TOPICPARAMETERS_H_
20-
#define TOPICPARAMETERS_H_
19+
#ifndef _FASTDDS_TOPICPARAMETERS_H_
20+
#define _FASTDDS_TOPICPARAMETERS_H_
2121

2222
#include <string>
2323

24+
#include <fastdds/dds/core/policy/QosPolicies.hpp>
2425
#include <fastdds/rtps/common/Types.h>
25-
#include <fastrtps/qos/QosPolicies.h>
26-
2726

2827
namespace eprosima {
2928
namespace fastdds {
@@ -104,15 +103,15 @@ class TopicAttributes
104103
//!Topic Data Type.
105104
fastcdr::string_255 topicDataType;
106105
//!QOS Regarding the History to be saved.
107-
HistoryQosPolicy historyQos;
106+
dds::HistoryQosPolicy historyQos;
108107
//!QOS Regarding the resources to allocate.
109-
ResourceLimitsQosPolicy resourceLimitsQos;
108+
dds::ResourceLimitsQosPolicy resourceLimitsQos;
110109
//!Type Identifier XTYPES 1.1
111-
TypeIdV1 type_id;
110+
dds::TypeIdV1 type_id;
112111
//!Type Object XTYPES 1.1
113-
TypeObjectV1 type;
112+
dds::TypeObjectV1 type;
114113
//!XTYPES 1.2
115-
xtypes::TypeInformationParameter type_information;
114+
dds::xtypes::TypeInformationParameter type_information;
116115

117116
/**
118117
* Method to check whether the defined QOS are correct.
@@ -137,7 +136,7 @@ bool inline operator !=(
137136
|| t1.topicName != t2.topicName
138137
|| t1.topicDataType != t2.topicDataType
139138
|| t1.historyQos.kind != t2.historyQos.kind
140-
|| (t1.historyQos.kind == KEEP_LAST_HISTORY_QOS && t1.historyQos.depth != t2.historyQos.depth))
139+
|| (t1.historyQos.kind == dds::KEEP_LAST_HISTORY_QOS && t1.historyQos.depth != t2.historyQos.depth))
141140
{
142141
return true;
143142
}
@@ -149,4 +148,4 @@ bool inline operator !=(
149148
} /* namespace fastdds */
150149
} /* namespace eprosima */
151150

152-
#endif /* TOPICPARAMETERS_H_ */
151+
#endif /* _FASTDDS_TOPICPARAMETERS_H_ */

‎include/fastdds/rtps/builtin/data/ReaderProxyData.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -305,22 +305,22 @@ class ReaderProxyData
305305
}
306306

307307
FASTDDS_EXPORTED_API void type_id(
308-
const TypeIdV1& other_type_id)
308+
const dds::TypeIdV1& other_type_id)
309309
{
310310
type_id() = other_type_id;
311311
}
312312

313-
FASTDDS_EXPORTED_API const TypeIdV1& type_id() const
313+
FASTDDS_EXPORTED_API const dds::TypeIdV1& type_id() const
314314
{
315315
assert(m_type_id != nullptr);
316316
return *m_type_id;
317317
}
318318

319-
FASTDDS_EXPORTED_API TypeIdV1& type_id()
319+
FASTDDS_EXPORTED_API dds::TypeIdV1& type_id()
320320
{
321321
if (m_type_id == nullptr)
322322
{
323-
m_type_id = new TypeIdV1();
323+
m_type_id = new dds::TypeIdV1();
324324
}
325325
return *m_type_id;
326326
}
@@ -331,22 +331,22 @@ class ReaderProxyData
331331
}
332332

333333
FASTDDS_EXPORTED_API void type(
334-
const TypeObjectV1& other_type)
334+
const dds::TypeObjectV1& other_type)
335335
{
336336
type() = other_type;
337337
}
338338

339-
FASTDDS_EXPORTED_API const TypeObjectV1& type() const
339+
FASTDDS_EXPORTED_API const dds::TypeObjectV1& type() const
340340
{
341341
assert(m_type != nullptr);
342342
return *m_type;
343343
}
344344

345-
FASTDDS_EXPORTED_API TypeObjectV1& type()
345+
FASTDDS_EXPORTED_API dds::TypeObjectV1& type()
346346
{
347347
if (m_type == nullptr)
348348
{
349-
m_type = new TypeObjectV1();
349+
m_type = new dds::TypeObjectV1();
350350
}
351351
return *m_type;
352352
}
@@ -357,22 +357,22 @@ class ReaderProxyData
357357
}
358358

359359
FASTDDS_EXPORTED_API void type_information(
360-
const xtypes::TypeInformationParameter& other_type_information)
360+
const dds::xtypes::TypeInformationParameter& other_type_information)
361361
{
362362
type_information() = other_type_information;
363363
}
364364

365-
FASTDDS_EXPORTED_API const xtypes::TypeInformationParameter& type_information() const
365+
FASTDDS_EXPORTED_API const dds::xtypes::TypeInformationParameter& type_information() const
366366
{
367367
assert(m_type_information != nullptr);
368368
return *m_type_information;
369369
}
370370

371-
FASTDDS_EXPORTED_API xtypes::TypeInformationParameter& type_information()
371+
FASTDDS_EXPORTED_API dds::xtypes::TypeInformationParameter& type_information()
372372
{
373373
if (m_type_information == nullptr)
374374
{
375-
m_type_information = new xtypes::TypeInformationParameter();
375+
m_type_information = new dds::xtypes::TypeInformationParameter();
376376
}
377377
return *m_type_information;
378378
}
@@ -502,11 +502,11 @@ class ReaderProxyData
502502
//!Topic kind
503503
TopicKind_t m_topicKind;
504504
//!Type Identifier
505-
TypeIdV1* m_type_id;
505+
dds::TypeIdV1* m_type_id;
506506
//!Type Object
507-
TypeObjectV1* m_type;
507+
dds::TypeObjectV1* m_type;
508508
//!Type Information
509-
xtypes::TypeInformationParameter* m_type_information;
509+
dds::xtypes::TypeInformationParameter* m_type_information;
510510
//!
511511
ParameterPropertyList_t m_properties;
512512
//!Information on the content filter applied by the reader.

‎include/fastdds/rtps/builtin/data/WriterProxyData.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -310,22 +310,22 @@ class WriterProxyData
310310
}
311311

312312
FASTDDS_EXPORTED_API void type_id(
313-
const TypeIdV1& other_type_id)
313+
const dds::TypeIdV1& other_type_id)
314314
{
315315
type_id() = other_type_id;
316316
}
317317

318-
FASTDDS_EXPORTED_API const TypeIdV1& type_id() const
318+
FASTDDS_EXPORTED_API const dds::TypeIdV1& type_id() const
319319
{
320320
assert(m_type_id != nullptr);
321321
return *m_type_id;
322322
}
323323

324-
FASTDDS_EXPORTED_API TypeIdV1& type_id()
324+
FASTDDS_EXPORTED_API dds::TypeIdV1& type_id()
325325
{
326326
if (m_type_id == nullptr)
327327
{
328-
m_type_id = new TypeIdV1();
328+
m_type_id = new dds::TypeIdV1();
329329
}
330330
return *m_type_id;
331331
}
@@ -336,22 +336,22 @@ class WriterProxyData
336336
}
337337

338338
FASTDDS_EXPORTED_API void type(
339-
const TypeObjectV1& other_type)
339+
const dds::TypeObjectV1& other_type)
340340
{
341341
type() = other_type;
342342
}
343343

344-
FASTDDS_EXPORTED_API const TypeObjectV1& type() const
344+
FASTDDS_EXPORTED_API const dds::TypeObjectV1& type() const
345345
{
346346
assert(m_type != nullptr);
347347
return *m_type;
348348
}
349349

350-
FASTDDS_EXPORTED_API TypeObjectV1& type()
350+
FASTDDS_EXPORTED_API dds::TypeObjectV1& type()
351351
{
352352
if (m_type == nullptr)
353353
{
354-
m_type = new TypeObjectV1();
354+
m_type = new dds::TypeObjectV1();
355355
}
356356
return *m_type;
357357
}
@@ -362,22 +362,22 @@ class WriterProxyData
362362
}
363363

364364
FASTDDS_EXPORTED_API void type_information(
365-
const xtypes::TypeInformationParameter& other_type_information)
365+
const dds::xtypes::TypeInformationParameter& other_type_information)
366366
{
367367
type_information() = other_type_information;
368368
}
369369

370-
FASTDDS_EXPORTED_API const xtypes::TypeInformationParameter& type_information() const
370+
FASTDDS_EXPORTED_API const dds::xtypes::TypeInformationParameter& type_information() const
371371
{
372372
assert(m_type_information != nullptr);
373373
return *m_type_information;
374374
}
375375

376-
FASTDDS_EXPORTED_API xtypes::TypeInformationParameter& type_information()
376+
FASTDDS_EXPORTED_API dds::xtypes::TypeInformationParameter& type_information()
377377
{
378378
if (m_type_information == nullptr)
379379
{
380-
m_type_information = new xtypes::TypeInformationParameter();
380+
m_type_information = new dds::xtypes::TypeInformationParameter();
381381
}
382382
return *m_type_information;
383383
}
@@ -496,13 +496,13 @@ class WriterProxyData
496496
GUID_t persistence_guid_;
497497

498498
//!Type Identifier
499-
TypeIdV1* m_type_id;
499+
dds::TypeIdV1* m_type_id;
500500

501501
//!Type Object
502-
TypeObjectV1* m_type;
502+
dds::TypeObjectV1* m_type;
503503

504504
//!Type Information
505-
xtypes::TypeInformationParameter* m_type_information;
505+
dds::xtypes::TypeInformationParameter* m_type_information;
506506

507507
//!
508508
ParameterPropertyList_t m_properties;

‎include/fastdds/rtps/writer/RTPSWriter.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ class RTPSWriter
469469
*
470470
* @return Liveliness kind
471471
*/
472-
const LivelinessQosPolicyKind& get_liveliness_kind() const;
472+
const dds::LivelinessQosPolicyKind& get_liveliness_kind() const;
473473

474474
/**
475475
* @brief A method to retrieve the liveliness lease duration
@@ -550,7 +550,7 @@ class RTPSWriter
550550
bool m_separateSendingEnabled = false;
551551

552552
//! The liveliness kind of this writer
553-
LivelinessQosPolicyKind liveliness_kind_;
553+
dds::LivelinessQosPolicyKind liveliness_kind_;
554554
//! The liveliness lease duration of this writer
555555
Duration_t liveliness_lease_duration_;
556556
//! The liveliness announcement period

0 commit comments

Comments
 (0)