Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[21159] Remove include/fastrtps #4930

Merged
merged 8 commits into from
Jun 19, 2024
Merged

[21159] Remove include/fastrtps #4930

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c861a96
Refs #21159: Remove LibrarySettingsAttributes.h
EduPonz Jun 10, 2024
14ffe1d
Refs #21159: Remove include/fastrtps/common
EduPonz Jun 10, 2024
40197e7
Refs #21159: Remove ParameterTypes.h
EduPonz Jun 10, 2024
fd6df57
Refs #21159: Remove QosPolicies.h
EduPonz Jun 11, 2024
674f160
Refs #21159: Move doxygen_modules.h
EduPonz Jun 11, 2024
848fec7
Refs #21159: Apply Eliana's suggestions
EduPonz Jun 14, 2024
80463c2
Refs #21159: Remove installation of include/fastrtps
EduPonz Jun 14, 2024
2891a39
Refs #21159: Correct CacheChange_t forward declaration
EduPonz Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions examples/cpp/dds/RequestReplyExample/CalculatorClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@
#include <mutex>
#include <vector>

#include "CalculatorPubSubTypes.h"

#include <fastdds/dds/domain/DomainParticipant.hpp>
#include <fastdds/dds/domain/DomainParticipantFactory.hpp>
#include <fastdds/dds/publisher/DataWriter.hpp>
#include <fastdds/dds/publisher/Publisher.hpp>
#include <fastdds/dds/subscriber/DataReader.hpp>
#include <fastdds/dds/subscriber/SampleInfo.hpp>
#include <fastdds/dds/subscriber/Subscriber.hpp>

#include "CalculatorPubSubTypes.h"
#include <fastdds/rtps/common/WriteParams.h>

class CalculatorClient
{
Expand Down
5 changes: 3 additions & 2 deletions examples/cpp/dds/RequestReplyExample/CalculatorServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@
#include <mutex>
#include <vector>

#include "CalculatorPubSubTypes.h"

#include <fastdds/dds/domain/DomainParticipant.hpp>
#include <fastdds/dds/domain/DomainParticipantFactory.hpp>
#include <fastdds/dds/publisher/DataWriter.hpp>
#include <fastdds/dds/publisher/Publisher.hpp>
#include <fastdds/dds/subscriber/DataReader.hpp>
#include <fastdds/dds/subscriber/SampleInfo.hpp>
#include <fastdds/dds/subscriber/Subscriber.hpp>

#include "CalculatorPubSubTypes.h"
#include <fastdds/rtps/common/WriteParams.h>

class CalculatorServer
{
Expand Down
8 changes: 4 additions & 4 deletions include/fastrtps/config/doxygen_modules.h → include/fastdds/config/doxygen_modules.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
// limitations under the License.

/**
* @file doxygen_modules.h
* @file doxygen_modules.hpp
*/

#ifndef RTPS_DOXYGEN_MODULES_H_
#define RTPS_DOXYGEN_MODULES_H_
#ifndef _FASTDDS_DOXYGEN_MODULES_HPP_
#define _FASTDDS_DOXYGEN_MODULES_HPP_

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

Expand Down Expand Up @@ -141,4 +141,4 @@
* @ingroup UTILITIES_MODULE
*/

#endif /* RTPS_DOXYGEN_MODULES_H_ */
#endif /* _FASTDDS_DOXYGEN_MODULES_HPP_ */
30 changes: 30 additions & 0 deletions include/fastdds/dds/core/policy/ParameterTypes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1863,6 +1863,36 @@ T get_proxy_property(
}

} //namespace dds

namespace rtps {

using ParameterId_t = fastdds::dds::ParameterId_t;
elianalf marked this conversation as resolved.
Show resolved Hide resolved
using Parameter_t = fastdds::dds::Parameter_t;
using ParameterKey_t = fastdds::dds::ParameterKey_t;
using ParameterLocator_t = fastdds::dds::ParameterLocator_t;
using ParameterString_t = fastdds::dds::ParameterString_t;
using ParameterPort_t = fastdds::dds::ParameterPort_t;
using ParameterGuid_t = fastdds::dds::ParameterGuid_t;
using ParameterDomainId_t = fastdds::dds::ParameterDomainId_t;
using ParameterProtocolVersion_t = fastdds::dds::ParameterProtocolVersion_t;
using ParameterVendorId_t = fastdds::dds::ParameterVendorId_t;
using ParameterIP4Address_t = fastdds::dds::ParameterIP4Address_t;
using ParameterBool_t = fastdds::dds::ParameterBool_t;
using ParameterStatusInfo_t = fastdds::dds::ParameterStatusInfo_t;
using ParameterCount_t = fastdds::dds::ParameterCount_t;
using ParameterEntityId_t = fastdds::dds::ParameterEntityId_t;
using ParameterTime_t = fastdds::dds::ParameterTime_t;
using ParameterBuiltinEndpointSet_t = fastdds::dds::ParameterBuiltinEndpointSet_t;
using ParameterNetworkConfigSet_t = fastdds::dds::ParameterNetworkConfigSet_t;
using ParameterPropertyList_t = fastdds::dds::ParameterPropertyList_t;
using ParameterSampleIdentity_t = fastdds::dds::ParameterSampleIdentity_t;
#if HAVE_SECURITY
using ParameterToken_t = fastdds::dds::ParameterToken_t;
using ParameterParticipantSecurityInfo_t = fastdds::dds::ParameterParticipantSecurityInfo_t;
using ParameterEndpointSecurityInfo_t = fastdds::dds::ParameterEndpointSecurityInfo_t;
#endif // if HAVE_SECURITY

} //namespace rtps
} //namespace fastdds
} //namespace eprosima

Expand Down
6 changes: 6 additions & 0 deletions include/fastdds/dds/publisher/Publisher.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ namespace fastdds {

class TopicAttributes;

namespace rtps {

class IPayloadPool;

} // namespace rtps

namespace dds {

class DomainParticipant;
Expand Down
7 changes: 5 additions & 2 deletions include/fastdds/dds/subscriber/Subscriber.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,12 @@ namespace fastdds {

class TopicAttributes;

} // namespace fastdds
namespace rtps {

class IPayloadPool;

} // namespace rtps

namespace fastdds {
namespace dds {

class DomainParticipant;
Expand Down
21 changes: 10 additions & 11 deletions include/fastdds/rtps/attributes/TopicAttributes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@
* @file TopicAttributes.h
*/

#ifndef TOPICPARAMETERS_H_
#define TOPICPARAMETERS_H_
#ifndef _FASTDDS_TOPICPARAMETERS_H_
#define _FASTDDS_TOPICPARAMETERS_H_

#include <string>

#include <fastdds/dds/core/policy/QosPolicies.hpp>
#include <fastdds/rtps/common/Types.h>
#include <fastrtps/qos/QosPolicies.h>


namespace eprosima {
namespace fastdds {
Expand Down Expand Up @@ -104,15 +103,15 @@ class TopicAttributes
//!Topic Data Type.
fastcdr::string_255 topicDataType;
//!QOS Regarding the History to be saved.
HistoryQosPolicy historyQos;
dds::HistoryQosPolicy historyQos;
//!QOS Regarding the resources to allocate.
ResourceLimitsQosPolicy resourceLimitsQos;
dds::ResourceLimitsQosPolicy resourceLimitsQos;
//!Type Identifier XTYPES 1.1
TypeIdV1 type_id;
dds::TypeIdV1 type_id;
//!Type Object XTYPES 1.1
TypeObjectV1 type;
dds::TypeObjectV1 type;
//!XTYPES 1.2
xtypes::TypeInformationParameter type_information;
dds::xtypes::TypeInformationParameter type_information;

/**
* Method to check whether the defined QOS are correct.
Expand All @@ -137,7 +136,7 @@ bool inline operator !=(
|| t1.topicName != t2.topicName
|| t1.topicDataType != t2.topicDataType
|| t1.historyQos.kind != t2.historyQos.kind
|| (t1.historyQos.kind == KEEP_LAST_HISTORY_QOS && t1.historyQos.depth != t2.historyQos.depth))
|| (t1.historyQos.kind == dds::KEEP_LAST_HISTORY_QOS && t1.historyQos.depth != t2.historyQos.depth))
{
return true;
}
Expand All @@ -149,4 +148,4 @@ bool inline operator !=(
} /* namespace fastdds */
} /* namespace eprosima */

#endif /* TOPICPARAMETERS_H_ */
#endif /* _FASTDDS_TOPICPARAMETERS_H_ */
30 changes: 15 additions & 15 deletions include/fastdds/rtps/builtin/data/ReaderProxyData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,22 +305,22 @@ class ReaderProxyData
}

FASTDDS_EXPORTED_API void type_id(
const TypeIdV1& other_type_id)
const dds::TypeIdV1& other_type_id)
{
type_id() = other_type_id;
}

FASTDDS_EXPORTED_API const TypeIdV1& type_id() const
FASTDDS_EXPORTED_API const dds::TypeIdV1& type_id() const
{
assert(m_type_id != nullptr);
return *m_type_id;
}

FASTDDS_EXPORTED_API TypeIdV1& type_id()
FASTDDS_EXPORTED_API dds::TypeIdV1& type_id()
{
if (m_type_id == nullptr)
{
m_type_id = new TypeIdV1();
m_type_id = new dds::TypeIdV1();
}
return *m_type_id;
}
Expand All @@ -331,22 +331,22 @@ class ReaderProxyData
}

FASTDDS_EXPORTED_API void type(
const TypeObjectV1& other_type)
const dds::TypeObjectV1& other_type)
{
type() = other_type;
}

FASTDDS_EXPORTED_API const TypeObjectV1& type() const
FASTDDS_EXPORTED_API const dds::TypeObjectV1& type() const
{
assert(m_type != nullptr);
return *m_type;
}

FASTDDS_EXPORTED_API TypeObjectV1& type()
FASTDDS_EXPORTED_API dds::TypeObjectV1& type()
{
if (m_type == nullptr)
{
m_type = new TypeObjectV1();
m_type = new dds::TypeObjectV1();
}
return *m_type;
}
Expand All @@ -357,22 +357,22 @@ class ReaderProxyData
}

FASTDDS_EXPORTED_API void type_information(
const xtypes::TypeInformationParameter& other_type_information)
const dds::xtypes::TypeInformationParameter& other_type_information)
{
type_information() = other_type_information;
}

FASTDDS_EXPORTED_API const xtypes::TypeInformationParameter& type_information() const
FASTDDS_EXPORTED_API const dds::xtypes::TypeInformationParameter& type_information() const
{
assert(m_type_information != nullptr);
return *m_type_information;
}

FASTDDS_EXPORTED_API xtypes::TypeInformationParameter& type_information()
FASTDDS_EXPORTED_API dds::xtypes::TypeInformationParameter& type_information()
{
if (m_type_information == nullptr)
{
m_type_information = new xtypes::TypeInformationParameter();
m_type_information = new dds::xtypes::TypeInformationParameter();
}
return *m_type_information;
}
Expand Down Expand Up @@ -502,11 +502,11 @@ class ReaderProxyData
//!Topic kind
TopicKind_t m_topicKind;
//!Type Identifier
TypeIdV1* m_type_id;
dds::TypeIdV1* m_type_id;
//!Type Object
TypeObjectV1* m_type;
dds::TypeObjectV1* m_type;
//!Type Information
xtypes::TypeInformationParameter* m_type_information;
dds::xtypes::TypeInformationParameter* m_type_information;
//!
ParameterPropertyList_t m_properties;
//!Information on the content filter applied by the reader.
Expand Down
30 changes: 15 additions & 15 deletions include/fastdds/rtps/builtin/data/WriterProxyData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,22 +310,22 @@ class WriterProxyData
}

FASTDDS_EXPORTED_API void type_id(
const TypeIdV1& other_type_id)
const dds::TypeIdV1& other_type_id)
{
type_id() = other_type_id;
}

FASTDDS_EXPORTED_API const TypeIdV1& type_id() const
FASTDDS_EXPORTED_API const dds::TypeIdV1& type_id() const
{
assert(m_type_id != nullptr);
return *m_type_id;
}

FASTDDS_EXPORTED_API TypeIdV1& type_id()
FASTDDS_EXPORTED_API dds::TypeIdV1& type_id()
{
if (m_type_id == nullptr)
{
m_type_id = new TypeIdV1();
m_type_id = new dds::TypeIdV1();
}
return *m_type_id;
}
Expand All @@ -336,22 +336,22 @@ class WriterProxyData
}

FASTDDS_EXPORTED_API void type(
const TypeObjectV1& other_type)
const dds::TypeObjectV1& other_type)
{
type() = other_type;
}

FASTDDS_EXPORTED_API const TypeObjectV1& type() const
FASTDDS_EXPORTED_API const dds::TypeObjectV1& type() const
{
assert(m_type != nullptr);
return *m_type;
}

FASTDDS_EXPORTED_API TypeObjectV1& type()
FASTDDS_EXPORTED_API dds::TypeObjectV1& type()
{
if (m_type == nullptr)
{
m_type = new TypeObjectV1();
m_type = new dds::TypeObjectV1();
}
return *m_type;
}
Expand All @@ -362,22 +362,22 @@ class WriterProxyData
}

FASTDDS_EXPORTED_API void type_information(
const xtypes::TypeInformationParameter& other_type_information)
const dds::xtypes::TypeInformationParameter& other_type_information)
{
type_information() = other_type_information;
}

FASTDDS_EXPORTED_API const xtypes::TypeInformationParameter& type_information() const
FASTDDS_EXPORTED_API const dds::xtypes::TypeInformationParameter& type_information() const
{
assert(m_type_information != nullptr);
return *m_type_information;
}

FASTDDS_EXPORTED_API xtypes::TypeInformationParameter& type_information()
FASTDDS_EXPORTED_API dds::xtypes::TypeInformationParameter& type_information()
{
if (m_type_information == nullptr)
{
m_type_information = new xtypes::TypeInformationParameter();
m_type_information = new dds::xtypes::TypeInformationParameter();
}
return *m_type_information;
}
Expand Down Expand Up @@ -496,13 +496,13 @@ class WriterProxyData
GUID_t persistence_guid_;

//!Type Identifier
TypeIdV1* m_type_id;
dds::TypeIdV1* m_type_id;

//!Type Object
TypeObjectV1* m_type;
dds::TypeObjectV1* m_type;

//!Type Information
xtypes::TypeInformationParameter* m_type_information;
dds::xtypes::TypeInformationParameter* m_type_information;

//!
ParameterPropertyList_t m_properties;
Expand Down
4 changes: 2 additions & 2 deletions include/fastdds/rtps/writer/RTPSWriter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ class RTPSWriter
*
* @return Liveliness kind
*/
const LivelinessQosPolicyKind& get_liveliness_kind() const;
const dds::LivelinessQosPolicyKind& get_liveliness_kind() const;

/**
* @brief A method to retrieve the liveliness lease duration
Expand Down Expand Up @@ -550,7 +550,7 @@ class RTPSWriter
bool m_separateSendingEnabled = false;

//! The liveliness kind of this writer
LivelinessQosPolicyKind liveliness_kind_;
dds::LivelinessQosPolicyKind liveliness_kind_;
//! The liveliness lease duration of this writer
Duration_t liveliness_lease_duration_;
//! The liveliness announcement period
Expand Down
Loading
Loading