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

[20819] Make TimedEvent private #4727

Merged
merged 1 commit into from
May 22, 2024
Merged

[20819] Make TimedEvent private #4727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/cpp/fastdds/publisher/DataWriterImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include <fastdds/rtps/attributes/TopicAttributes.h>
#include <fastdds/rtps/participant/RTPSParticipant.h>
#include <fastdds/rtps/resources/ResourceEvent.h>
#include <fastdds/rtps/resources/TimedEvent.h>
#include <fastdds/rtps/RTPSDomain.h>
#include <fastdds/rtps/writer/RTPSWriter.h>
#include <fastdds/rtps/writer/StatefulWriter.h>
Expand All @@ -49,6 +48,7 @@
#include <rtps/history/TopicPayloadPoolRegistry.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/RTPSDomainImpl.hpp>
#include <rtps/resources/TimedEvent.h>
#include <utils/TimeConversion.hpp>
#ifdef FASTDDS_STATISTICS
#include <statistics/fastdds/domain/DomainParticipantImpl.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/fastdds/subscriber/DataReaderImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
#include <fastdds/rtps/participant/RTPSParticipant.h>
#include <fastdds/rtps/reader/RTPSReader.h>
#include <fastdds/rtps/resources/ResourceEvent.h>
#include <fastdds/rtps/resources/TimedEvent.h>
#include <fastdds/rtps/RTPSDomain.h>
#include <fastdds/subscriber/DataReaderImpl.hpp>
#include <fastdds/subscriber/DataReaderImpl/ReadTakeCommand.hpp>
Expand All @@ -50,6 +49,7 @@

#include <rtps/history/TopicPayloadPoolRegistry.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/resources/TimedEvent.h>
#include <utils/TimeConversion.hpp>
#ifdef FASTDDS_STATISTICS
#include <statistics/fastdds/domain/DomainParticipantImpl.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/builtin/data/ParticipantProxyData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
#include <fastdds/rtps/builtin/data/WriterProxyData.h>
#include <fastdds/rtps/common/VendorId_t.hpp>
#include <fastdds/rtps/resources/TimedEvent.h>

#include <rtps/builtin/BuiltinProtocols.h>
#include <rtps/builtin/discovery/participant/PDPSimple.h>
#include <rtps/network/NetworkFactory.h>
#include <rtps/resources/TimedEvent.h>
#include <rtps/transport/shared_mem/SHMLocator.hpp>
#include <utils/TimeConversion.hpp>

Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
#include <fastdds/rtps/participant/RTPSParticipantListener.h>
#include <fastdds/rtps/reader/RTPSReader.h>
#include <fastdds/rtps/resources/TimedEvent.h>

#include <rtps/builtin/discovery/endpoint/EDP.h>
#include <rtps/builtin/discovery/participant/PDP.h>
#include <rtps/builtin/discovery/participant/PDPEndpoints.hpp>
#include <rtps/builtin/discovery/participant/PDPListener.h>
#include <rtps/network/utils/external_locators.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/resources/TimedEvent.h>

using ParameterList = eprosima::fastdds::dds::ParameterList;

Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/builtin/discovery/participant/PDP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
#include <fastdds/rtps/participant/RTPSParticipantListener.h>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <fastdds/rtps/reader/StatelessReader.h>
#include <fastdds/rtps/resources/TimedEvent.h>
#include <fastdds/rtps/writer/StatelessWriter.h>

#include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
Expand All @@ -49,6 +48,7 @@
#include <rtps/builtin/liveliness/WLP.h>
#include <rtps/history/TopicPayloadPoolRegistry.hpp>
#include <rtps/network/utils/external_locators.hpp>
#include <rtps/resources/TimedEvent.h>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <utils/shared_mutex.hpp>
#include <utils/TimeConversion.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
#include <fastdds/rtps/participant/RTPSParticipantListener.h>
#include <fastdds/rtps/reader/RTPSReader.h>
#include <fastdds/rtps/resources/TimedEvent.h>

#include <rtps/builtin/discovery/endpoint/EDP.h>
#include <rtps/builtin/discovery/participant/PDP.h>
#include <rtps/builtin/discovery/participant/PDPEndpoints.hpp>
#include <rtps/network/utils/external_locators.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/resources/TimedEvent.h>
#ifdef FASTDDS_STATISTICS
#include <statistics/rtps/monitor-service/interfaces/IConnectionsObserver.hpp>
#endif //FASTDDS_STATISTICS
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include <fastdds/rtps/participant/RTPSParticipantListener.h>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <fastdds/rtps/reader/StatelessReader.h>
#include <fastdds/rtps/resources/TimedEvent.h>
#include <fastdds/rtps/writer/StatelessWriter.h>

#include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
Expand All @@ -45,6 +44,7 @@
#include <rtps/builtin/liveliness/WLP.h>
#include <rtps/history/TopicPayloadPoolRegistry.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/resources/TimedEvent.h>

namespace eprosima {
namespace fastrtps {
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#define _FASTDDS_RTPS_DSCLIENTEVENT_H_
#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC

#include <fastdds/rtps/resources/TimedEvent.h>
#include <rtps/resources/TimedEvent.h>

namespace eprosima {
namespace fastdds {
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#define _FASTDDS_RTPS_DSERVEREVENT2_H_
#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC

#include <fastdds/rtps/resources/TimedEvent.h>
#include <rtps/resources/TimedEvent.h>

namespace eprosima {
namespace fastdds {
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/builtin/liveliness/WLP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include <fastdds/rtps/history/WriterHistory.h>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <fastdds/rtps/resources/ResourceEvent.h>
#include <fastdds/rtps/resources/TimedEvent.h>

#include <fastdds/rtps/writer/StatefulWriter.h>
#include <fastdds/rtps/writer/WriterListener.h>
Expand All @@ -39,6 +38,7 @@
#include <rtps/builtin/liveliness/WLPListener.h>
#include <rtps/history/TopicPayloadPoolRegistry.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/resources/TimedEvent.h>
#include <rtps/writer/LivelinessManager.hpp>
#include <utils/TimeConversion.hpp>

Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/reader/WriterProxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
#include <fastdds/rtps/builtin/data/WriterProxyData.h>
#include <fastdds/rtps/messages/RTPSMessageCreator.h>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <fastdds/rtps/resources/TimedEvent.h>
#include <fastdds/rtps/writer/RTPSWriter.h>

#include "rtps/RTPSDomainImpl.hpp"
#include "utils/collections/node_size_helpers.hpp"
#include <rtps/network/utils/external_locators.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/resources/TimedEvent.h>

#if !defined(NDEBUG) && !defined(ANDROID) && defined(FASTDDS_SOURCE) && defined(__unix__)
#define SHOULD_DEBUG_LINUX
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/resources/TimedEvent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
*/

#include <fastdds/rtps/resources/TimedEvent.h>
#include <rtps/resources/TimedEvent.h>
#include <fastdds/rtps/resources/ResourceEvent.h>

#include "TimedEventImpl.h"
Expand Down
0 include/fastdds/rtps/resources/TimedEvent.h → src/cpp/rtps/resources/TimedEvent.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/cpp/rtps/resources/TimedEventImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC

#include <fastdds/rtps/common/Time_t.h>
#include <fastdds/rtps/resources/TimedEvent.h>
#include <rtps/resources/TimedEvent.h>

#include <atomic>
#include <functional>
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/security/SecurityManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
#include <fastdds/rtps/common/SequenceNumber.h>
#include <fastdds/rtps/common/SerializedPayload.h>
#include <fastdds/rtps/reader/ReaderListener.h>
#include <fastdds/rtps/resources/TimedEvent.h>
#include <fastdds/rtps/security/authentication/Handshake.h>
#include <fastdds/rtps/security/common/ParticipantGenericMessage.h>
#include <fastdds/rtps/writer/WriterListener.h>

#include <rtps/resources/TimedEvent.h>
#include <rtps/security/ISecurityPluginFactory.h>
#include <utils/ProxyPool.hpp>
#include <utils/shared_mutex.hpp>
Expand Down
3 changes: 1 addition & 2 deletions src/cpp/rtps/writer/LivelinessManager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@

#include <mutex>

#include <fastdds/rtps/resources/TimedEvent.h>
#include <fastdds/utils/collections/ResourceLimitedVector.hpp>

#include <rtps/resources/TimedEvent.h>
#include <rtps/writer/LivelinessData.hpp>
#include <utils/shared_mutex.hpp>

Expand Down
15 changes: 7 additions & 8 deletions src/cpp/rtps/writer/ReaderProxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,23 @@
*
*/

#include <fastdds/rtps/writer/ReaderProxy.h>

#include <mutex>
#include <cassert>
#include <algorithm>

#include <fastdds/dds/log/Log.hpp>
#include <fastdds/rtps/history/WriterHistory.h>
#include <fastdds/rtps/writer/ReaderProxy.h>
#include <fastdds/rtps/writer/StatefulWriter.h>
#include <fastdds/rtps/resources/TimedEvent.h>
#include <utils/TimeConversion.hpp>
#include <fastdds/rtps/common/LocatorListComparisons.hpp>

#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/history/HistoryAttributesExtension.hpp>

#include "rtps/messages/RTPSGapBuilder.hpp"
#include <rtps/DataSharing/DataSharingNotifier.hpp>
#include <rtps/resources/TimedEvent.h>
#include <utils/TimeConversion.hpp>

#include <mutex>
#include <cassert>
#include <algorithm>

namespace eprosima {
namespace fastrtps {
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/writer/StatefulWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include <fastdds/rtps/participant/RTPSParticipant.h>
#include <fastdds/rtps/reader/RTPSReader.h>
#include <fastdds/rtps/resources/ResourceEvent.h>
#include <fastdds/rtps/resources/TimedEvent.h>
#include <fastdds/rtps/writer/ReaderProxy.h>
#include <fastdds/rtps/writer/StatefulWriter.h>
#include <fastdds/rtps/writer/WriterListener.h>
Expand All @@ -47,6 +46,7 @@
#include <rtps/messages/RTPSGapBuilder.hpp>
#include <rtps/network/utils/external_locators.hpp>
#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/resources/TimedEvent.h>
#include <rtps/RTPSDomainImpl.hpp>

#ifdef FASTDDS_STATISTICS
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/statistics/rtps/monitor-service/MonitorService.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
#include <fastdds/dds/publisher/qos/WriterQos.hpp>
#include <fastdds/rtps/common/Guid.h>
#include <fastdds/rtps/history/WriterHistory.h>
#include <fastdds/rtps/resources/TimedEvent.h>
#include <fastdds/rtps/writer/StatefulWriter.h>

#include "Interfaces.hpp"
#include <rtps/history/ITopicPayloadPool.h>
#include <rtps/resources/TimedEvent.h>
#include <statistics/rtps/monitor-service/MonitorServiceListener.hpp>
#include <statistics/types/monitorservice_types.hpp>
#include <statistics/types/monitorservice_typesPubSubTypes.h>
Expand Down
0 ...Event/fastdds/rtps/resources/TimedEvent.h → ...ps/TimedEvent/rtps/resources/TimedEvent.h
View file
Open in desktop
File renamed without changes.
4 changes: 1 addition & 3 deletions test/unittest/rtps/reader/WriterProxyAcknackTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@
#include <fastdds/rtps/builtin/data/WriterProxyData.h>
#include <fastdds/rtps/reader/RTPSReader.h>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <fastdds/rtps/resources/TimedEvent.h>

#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/reader/WriterProxy.h>

#include <rtps/reader/WriterProxy.cpp>
#include <rtps/resources/TimedEvent.h>

#include "../../common/operators.hpp"

Expand Down
4 changes: 1 addition & 3 deletions test/unittest/rtps/reader/WriterProxyStopTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,10 @@
#include <fastdds/rtps/reader/RTPSReader.h>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <fastdds/rtps/resources/ResourceEvent.h>
#include <fastdds/rtps/resources/TimedEvent.h>

#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/reader/WriterProxy.h>

#include <rtps/reader/WriterProxy.cpp>
#include <rtps/resources/TimedEvent.h>

namespace testing {
namespace internal {
Expand Down
4 changes: 1 addition & 3 deletions test/unittest/rtps/reader/WriterProxyTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@
#include <fastdds/rtps/builtin/data/WriterProxyData.h>
#include <fastdds/rtps/reader/RTPSReader.h>
#include <fastdds/rtps/reader/StatefulReader.h>
#include <fastdds/rtps/resources/TimedEvent.h>

#include <rtps/participant/RTPSParticipantImpl.h>
#include <rtps/reader/WriterProxy.h>

#include <rtps/reader/WriterProxy.cpp>
#include <rtps/resources/TimedEvent.h>

#include "../../common/operators.hpp"

Expand Down
2 changes: 1 addition & 1 deletion test/unittest/rtps/resources/timedevent/mock/MockEvent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include <asio.hpp>

#include <fastdds/rtps/resources/TimedEvent.h>
#include <rtps/resources/TimedEvent.h>

class MockEvent
{
Expand Down
2 changes: 1 addition & 1 deletion ...st/statistics/rtps/mock/StatisticsBase/statistics/rtps/monitor-service/MonitorService.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
#include <fastdds/dds/publisher/qos/WriterQos.hpp>
#include <fastdds/rtps/common/Guid.h>
#include <fastdds/rtps/history/WriterHistory.h>
#include <fastdds/rtps/resources/TimedEvent.h>
#include <fastdds/rtps/writer/StatefulWriter.h>

#include <rtps/history/ITopicPayloadPool.h>
#include <rtps/resources/TimedEvent.h>
#include <statistics/rtps/monitor-service/Interfaces.hpp>
#include <statistics/rtps/monitor-service/MonitorServiceListener.hpp>
#include <statistics/types/monitorservice_types.hpp>
Expand Down
Loading