From ec08a6dc977cc79d2c5ec2784313de4ab4b6b7b8 Mon Sep 17 00:00:00 2001 From: eProsimaUser01 Date: Mon, 24 Nov 2014 11:53:57 +0100 Subject: [PATCH] Changed product name and folder structure to fastrtps --- .settings/language.settings.xml | 2 +- Makefile | 4 +- building/includes/eprosimartps_includes | 30 +- building/makefiles/eprosimartps.mk | 218 --------- building/makefiles/eprosimartps_sources | 12 +- building/makefiles/fastrtps.mk | 218 +++++++++ .../eprosimartps/config/eprosimartps_dll.h | 63 --- include/eprosimartps/pubsub/PUBSUBDomain.h | 56 --- .../pubsub/participant/PUBSUBParticipant.h | 48 -- include/eprosimartps/rtps/common/all_common.h | 28 -- include/eprosimartps/rtps_all.h | 46 -- include/fastrtps/Domain.h | 56 +++ .../pubsub => fastrtps}/PUBSUBDomain_old.h | 6 +- .../pubsub => fastrtps}/TopicDataType.h | 18 +- .../attributes/ParticipantAttributes.h} | 14 +- .../attributes/PublisherAttributes.h | 17 +- .../attributes/SubscriberAttributes.h | 16 +- .../attributes/TopicAttributes.h | 12 +- .../attributes/all_attributes.h | 2 +- .../config/doxygen_modules.h | 14 +- .../config/eProsima_auto_link.h | 0 .../config/eprosima_stl_exports.hpp | 4 +- include/fastrtps/config/fastrtps_dll.h | 63 +++ include/fastrtps/fastrtps_all.h | 46 ++ .../fastrtps_version.h} | 0 include/fastrtps/participant/Participant.h | 49 ++ .../participant/ParticipantImpl.h} | 41 +- .../pubsub => fastrtps}/publisher/Publisher.h | 8 +- .../publisher/PublisherHistory.h | 12 +- .../publisher/PublisherImpl.h | 34 +- .../publisher/PublisherListener.h | 14 +- .../pubsub => fastrtps}/qos/ParameterList.h | 16 +- .../pubsub => fastrtps}/qos/ParameterTypes.h | 12 +- .../pubsub => fastrtps}/qos/QosList.h | 8 +- .../pubsub => fastrtps}/qos/QosPolicies.h | 14 +- .../pubsub => fastrtps}/qos/ReaderQos.h | 8 +- .../pubsub => fastrtps}/qos/WriterQos.h | 8 +- .../rtps/Endpoint.h | 13 +- .../rtps/RTPSDomain.h | 14 +- .../rtps/attributes/EndpointAttributes.h | 7 +- .../rtps/attributes/HistoryAttributes.h | 5 +- .../attributes/RTPSParticipantAttributes.h | 9 +- .../rtps/attributes/ReaderAttributes.h | 9 +- .../rtps/attributes/WriterAttributes.h | 9 +- .../rtps/builtin/BuiltinProtocols.h | 4 +- .../rtps/builtin/ParticipantProxyData.h | 10 +- .../rtps/builtin/ReaderProxyData.h | 8 +- .../rtps/builtin/discovery/endpoint/EDP.h | 6 +- .../builtin/discovery/endpoint/EDPSimple.h | 8 +- .../discovery/endpoint/EDPSimpleListeners.h | 8 +- .../endpoint/EDPSimpleTopicDataType.h | 6 +- .../builtin/discovery/endpoint/EDPStatic.h | 6 +- .../builtin/discovery/endpoint/EDPStaticXML.h | 2 +- .../builtin/discovery/participant/PDPSimple.h | 8 +- .../discovery/participant/PDPSimpleListener.h | 8 +- .../participant/PDPSimpleTopicDataType.h | 6 +- .../RemoteParticipantLeaseDuration.h | 6 +- .../ResendParticipantProxyDataPeriod.h | 6 +- .../rtps/builtin/liveliness/WLP.h | 14 +- .../rtps/builtin/liveliness/WLPListener.h | 12 +- .../builtin/liveliness/WLPTopicDataType.h | 8 +- .../timedevent/WLivelinessPeriodicAssertion.h | 8 +- .../rtps/common/CDRMessage_t.h | 7 +- .../rtps/common/CacheChange.h | 17 +- .../rtps/common/Guid.h | 9 +- .../rtps/common/InstanceHandle.h | 11 +- .../rtps/common/Locator.h | 9 +- .../rtps/common/MatchingInfo.h | 7 +- .../rtps/common/SequenceNumber.h | 9 +- .../rtps/common/SerializedPayload.h | 9 +- .../rtps/common/Time_t.h | 7 +- .../rtps/common/Types.h | 7 +- include/fastrtps/rtps/common/all_common.h | 28 ++ .../rtps/history/CacheChangePool.h | 5 +- .../rtps/history/History.h | 13 +- .../rtps/history/ReaderHistory.h | 6 +- .../rtps/history/WriterHistory.h | 7 +- .../rtps/messages/CDRMessage.h | 11 +- .../rtps/messages/CDRMessage.hpp | 5 +- .../rtps/messages/CDRMessagePool.h | 7 +- .../rtps/messages/MessageReceiver.h | 11 +- .../rtps/messages/RTPSMessageCreator.h | 17 +- .../rtps/messages/RTPSMessageGroup.h | 9 +- .../rtps/messages/RTPS_messages.h | 9 +- .../rtps/participant/RTPSParticipant.h | 9 +- .../RTPSParticipantDiscoveryInfo.h | 4 +- .../rtps/participant/RTPSParticipantImpl.h | 13 +- .../participant/RTPSParticipantListener.h | 7 +- .../rtps/reader/RTPSReader.h | 10 +- .../rtps/reader/ReaderListener.h | 4 +- .../rtps/reader/StatefulReader.h | 6 +- .../rtps/reader/StatelessReader.h | 9 +- .../rtps/reader/WriterProxy.h | 14 +- .../rtps/reader/WriterProxyData.h | 8 +- .../timedevent/HeartbeatResponseDelay.h | 9 +- .../reader/timedevent/WriterProxyLiveliness.h | 7 +- .../rtps/resources/ListenResource.h | 5 +- .../rtps/resources/ListenResourceImpl.h | 7 +- .../rtps/resources/ResourceEvent.h | 5 +- .../rtps/resources/ResourceSend.h | 5 +- .../rtps/resources/ResourceSendImpl.h | 7 +- .../rtps/resources/TimedEvent.h | 7 +- .../rtps/resources/TimedEventImpl.h | 7 +- .../rtps/writer/RTPSWriter.h | 12 +- .../rtps/writer/ReaderLocator.h | 11 +- .../rtps/writer/ReaderProxy.h | 17 +- .../rtps/writer/StatefulWriter.h | 7 +- .../rtps/writer/StatelessWriter.h | 11 +- .../rtps/writer/WriterListener.h | 10 +- .../writer/timedevent/NackResponseDelay.h | 9 +- .../timedevent/NackSupressionDuration.h | 6 +- .../writer/timedevent/PeriodicHeartbeat.h | 9 +- .../timedevent/UnsentChangesNotEmptyEvent.h | 7 +- .../subscriber/SampleInfo.h | 6 +- .../subscriber/Subscriber.h | 8 +- .../subscriber/SubscriberListener.h | 6 +- .../utils/IPFinder.h | 8 +- .../utils/ObjectPool.h | 5 +- .../utils/RTPSLog.h | 10 +- .../utils/StringMatching.h | 5 +- .../utils/TimeConversion.h | 7 +- .../{eprosimartps => fastrtps}/utils/eClock.h | 8 +- .../{eprosimartps => fastrtps}/utils/md5.h | 2 +- rtpsgen/build.xml | 4 +- .../rtps/idl/templates/RTPSPubSubMain.stg | 2 +- .../idl/templates/RTPSPubSubTypeHeader.stg | 2 +- .../idl/templates/RTPSPublisherHeader.stg | 2 +- .../idl/templates/RTPSSubscriberHeader.stg | 2 +- .../eprosima/rtps/idl/templates/VS2010.stg | 4 +- .../eprosima/rtps/idl/templates/VS2013.stg | 4 +- rtpsgen/src/com/eprosima/rtps/rtpsgen.java | 8 +- .../com/eprosima/rtps/solution/Solution.java | 8 +- src/cpp/pubsub/PUBSUBDomain.cpp | 12 +- src/cpp/pubsub/PUBSUBDomain_old.cpp | 32 +- .../pubsub/participant/PUBSUBParticipant.cpp | 6 +- .../participant/PUBSUBParticipantImpl.cpp | 20 +- src/cpp/pubsub/publisher/Publisher.cpp | 8 +- src/cpp/pubsub/publisher/PublisherHistory.cpp | 10 +- src/cpp/pubsub/publisher/PublisherImpl.cpp | 14 +- src/cpp/pubsub/qos/ParameterList.cpp | 6 +- src/cpp/pubsub/qos/ParameterTypes.cpp | 6 +- src/cpp/pubsub/qos/QosList.cpp | 6 +- src/cpp/pubsub/qos/QosPolicies.cpp | 8 +- src/cpp/pubsub/qos/ReaderQos.cpp | 6 +- src/cpp/pubsub/qos/WriterQos.cpp | 6 +- src/cpp/pubsub/subscriber/Subscriber.cpp | 18 +- .../pubsub/subscriber/SubscriberListener.cpp | 4 +- src/cpp/rtps/Endpoint.cpp | 6 +- src/cpp/rtps/RTPSDomain.cpp | 25 +- src/cpp/rtps/builtin/BuiltinProtocols.cpp | 20 +- src/cpp/rtps/builtin/ParticipantProxyData.cpp | 12 +- src/cpp/rtps/builtin/ReaderProxyData.cpp | 8 +- .../rtps/builtin/discovery/endpoint/EDP.cpp | 32 +- .../builtin/discovery/endpoint/EDPSimple.cpp | 24 +- .../discovery/endpoint/EDPSimpleListeners.cpp | 16 +- .../endpoint/EDPSimpleTopicDataType.cpp | 8 +- .../builtin/discovery/endpoint/EDPStatic.cpp | 16 +- .../discovery/endpoint/EDPStaticXML.cpp | 12 +- .../discovery/participant/PDPSimple.cpp | 30 +- .../participant/PDPSimpleListener.cpp | 26 +- .../participant/PDPSimpleTopicDataType.cpp | 8 +- .../RemoteParticipantLeaseDuration.cpp | 12 +- .../ResendParticipantProxyDataPeriod.cpp | 14 +- src/cpp/rtps/builtin/liveliness/WLP.cpp | 24 +- .../rtps/builtin/liveliness/WLPListener.cpp | 18 +- .../builtin/liveliness/WLPTopicDataType.cpp | 8 +- .../WLivelinessPeriodicAssertion.cpp | 18 +- src/cpp/rtps/history/CacheChangePool.cpp | 11 +- src/cpp/rtps/history/History.cpp | 14 +- src/cpp/rtps/history/ReaderHistory.cpp | 13 +- src/cpp/rtps/history/WriterHistory.cpp | 8 +- src/cpp/rtps/messages/CDRMessagePool.cpp | 7 +- src/cpp/rtps/messages/MessageReceiver.cpp | 31 +- src/cpp/rtps/messages/RTPSMessageCreator.cpp | 23 +- src/cpp/rtps/messages/RTPSMessageGroup.cpp | 15 +- .../rtps/messages/submessages/AckNackMsg.hpp | 5 +- src/cpp/rtps/messages/submessages/DataMsg.hpp | 7 +- src/cpp/rtps/messages/submessages/GapMsg.hpp | 5 +- .../messages/submessages/HeartbeatMsg.hpp | 5 +- src/cpp/rtps/participant/RTPSParticipant.cpp | 11 +- .../rtps/participant/RTPSParticipantImpl.cpp | 37 +- src/cpp/rtps/reader/RTPSReader.cpp | 8 +- src/cpp/rtps/reader/StatefulReader.cpp | 6 +- src/cpp/rtps/reader/StatelessReader.cpp | 12 +- src/cpp/rtps/reader/WriterProxy.cpp | 12 +- src/cpp/rtps/reader/WriterProxyData.cpp | 8 +- .../timedevent/HeartbeatResponseDelay.cpp | 18 +- .../timedevent/WriterProxyLiveliness.cpp | 16 +- src/cpp/rtps/resources/ListenResource.cpp | 15 +- src/cpp/rtps/resources/ListenResourceImpl.cpp | 17 +- src/cpp/rtps/resources/ResourceEvent.cpp | 13 +- src/cpp/rtps/resources/ResourceSend.cpp | 11 +- src/cpp/rtps/resources/ResourceSendImpl.cpp | 11 +- src/cpp/rtps/resources/TimedEvent.cpp | 9 +- src/cpp/rtps/resources/TimedEventImpl.cpp | 11 +- src/cpp/rtps/writer/RTPSWriter.cpp | 12 +- src/cpp/rtps/writer/ReaderLocator.cpp | 9 +- src/cpp/rtps/writer/ReaderProxy.cpp | 19 +- src/cpp/rtps/writer/StatefulWriter.cpp | 32 +- src/cpp/rtps/writer/StatelessWriter.cpp | 12 +- .../writer/timedevent/NackResponseDelay.cpp | 19 +- .../timedevent/NackSupressionDuration.cpp | 15 +- .../writer/timedevent/PeriodicHeartbeat.cpp | 17 +- .../timedevent/UnsentChangesNotEmptyEvent.cpp | 13 +- src/cpp/utils/IPFinder.cpp | 7 +- src/cpp/utils/ObjectPool.cpp | 6 +- src/cpp/utils/StringMatching.cpp | 7 +- src/cpp/utils/eClock.cpp | 8 +- src/cpp/utils/md5.cpp | 2 +- utils/ShapesDemo/ShapesDemo.pro | 18 +- .../qt/ContentFilterSelector.h | 2 +- .../include/eprosimashapesdemo/qt/DrawArea.h | 2 +- .../eprosimashapesdemo/qt/UpdateThread.h | 2 +- .../eprosimashapesdemo/qt/mainwindow.h | 2 +- .../eprosimashapesdemo/qt/optionsdialog.h | 2 +- .../eprosimashapesdemo/qt/publishdialog.h | 2 +- .../eprosimashapesdemo/qt/subscribedialog.h | 2 +- .../eprosimashapesdemo/shapesdemo/Shape.h | 6 +- .../shapesdemo/ShapeHistory.h | 4 +- .../shapesdemo/ShapePublisher.h | 4 +- .../shapesdemo/ShapeSubscriber.h | 4 +- .../shapesdemo/ShapeTopicDataType.h | 4 +- .../shapesdemo/ShapesDemo.h | 4 +- utils/ShapesDemo/src/main.cpp | 4 +- .../src/qt/ContentFilterSelector.cpp | 2 +- utils/ShapesDemo/src/qt/DrawArea.cpp | 2 +- utils/ShapesDemo/src/qt/UpdateThread.cpp | 2 +- utils/ShapesDemo/src/qt/mainwindow.cpp | 2 +- utils/ShapesDemo/src/qt/publishdialog.cpp | 4 +- utils/ShapesDemo/src/qt/subscribedialog.cpp | 4 +- .../src/shapesdemo/ShapeHistory.cpp | 4 +- .../src/shapesdemo/ShapePublisher.cpp | 2 +- .../src/shapesdemo/ShapeSubscriber.cpp | 4 +- .../src/shapesdemo/ShapeTopicDataType.cpp | 2 +- .../ShapesDemo/src/shapesdemo/ShapesDemo.cpp | 4 +- utils/ShapesDemo_nogui/Makefile | 2 +- .../eprosimashapesdemo/shapesdemo/Shape.h | 6 +- .../shapesdemo/ShapeHistory.h | 4 +- .../shapesdemo/ShapePublisher.h | 4 +- .../shapesdemo/ShapeSubscriber.h | 4 +- .../shapesdemo/ShapeTopicDataType.h | 4 +- .../shapesdemo/ShapesDemo.h | 4 +- .../include/eprosimashapesdemo/utils/md5.h | 2 +- utils/ShapesDemo_nogui/src/main.cpp | 2 +- .../src/shapesdemo/ShapeHistory.cpp | 4 +- .../src/shapesdemo/ShapePublisher.cpp | 2 +- .../src/shapesdemo/ShapeSubscriber.cpp | 4 +- .../src/shapesdemo/ShapeTopicDataType.cpp | 2 +- .../src/shapesdemo/ShapesDemo.cpp | 4 +- utils/ShapesDemo_nogui/src/utils/md5.cpp | 2 +- .../doxycodeexamples/pubsub_example.cpp | 4 +- .../doxygen/doxycodeexamples/rtps_example.cpp | 4 +- utils/doxygen/doxyfile | 2 +- utils/doxygen/doxyfile_complete_api | 2 +- utils/doxygen/doxyfile_public_api | 2 +- utils/installers/ertps/linux/Makefile.am | 34 +- utils/installers/ertps/linux/configure.ac | 2 +- utils/installers/ertps/linux/setup_linux.sh | 28 +- utils/installers/ertps/windows/EnvVarPage.nsh | 36 +- .../windows/InstallRedistributablesVS2010.nsh | 2 +- .../windows/InstallRedistributablesVS2013.nsh | 2 +- utils/installers/ertps/windows/setup.nsi | 10 +- utils/pcTests/ClientServerTest/Makefile | 4 +- .../apache/ApacheClientTest.h | 4 +- .../ClientServerTest/apache/ApacheServer.h | 2 +- .../eprosima/ClientServerTypes.cpp | 2 +- .../eprosima/ClientServerTypes.h | 4 +- .../eprosima/EprosimaClient.cpp | 2 +- .../eprosima/EprosimaClient.h | 4 +- .../eprosima/EprosimaClientTest.cpp | 2 +- .../eprosima/EprosimaClientTest.h | 2 +- .../eprosima/EprosimaServer.cpp | 2 +- .../eprosima/EprosimaServer.h | 4 +- .../main_ClientServerTest.cpp | 4 +- utils/pcTests/DiscoveryTest/DiscoveryTest.cpp | 16 +- .../DiscoveryTest/DiscoveryTest_win.cpp | 16 +- utils/pcTests/DiscoveryTest/Makefile | 4 +- .../FastBufferTest/HelloWorldPublisher.cpp | 2 +- .../FastBufferTest/HelloWorldPublisher.h | 4 +- .../FastBufferTest/HelloWorldSubscriber.cpp | 2 +- .../FastBufferTest/HelloWorldSubscriber.h | 4 +- .../pcTests/FastBufferTest/HelloWorldType.cpp | 2 +- utils/pcTests/FastBufferTest/HelloWorldType.h | 4 +- .../FastBufferTest/HelloWorld_main.cpp | 4 +- utils/pcTests/FastBufferTest/Makefile | 4 +- .../ReliableCommunicationTest.cpp | 12 +- .../FullDiscoveryTest/FullDiscoveryTest.cpp | 28 +- .../FullDiscoveryTest_win.cpp | 16 +- utils/pcTests/FullDiscoveryTest/Makefile | 4 +- .../HelloWorldTest/HelloWorldPublisher.cpp | 2 +- .../HelloWorldTest/HelloWorldPublisher.h | 4 +- .../HelloWorldTest/HelloWorldSubscriber.cpp | 2 +- .../HelloWorldTest/HelloWorldSubscriber.h | 4 +- .../pcTests/HelloWorldTest/HelloWorldType.cpp | 2 +- utils/pcTests/HelloWorldTest/HelloWorldType.h | 4 +- .../HelloWorldTest/HelloWorld_main.cpp | 4 +- utils/pcTests/HelloWorldTest/Makefile | 4 +- .../ReliableCommunicationTest.cpp | 12 +- .../LatencyTest/LatencyTestPublisher.cpp | 2 +- .../LatencyTest/LatencyTestPublisher.h | 2 +- .../LatencyTest/LatencyTestSubscriber.cpp | 2 +- .../LatencyTest/LatencyTestSubscriber.h | 2 +- .../pcTests/LatencyTest/LatencyTestTypes.cpp | 2 +- utils/pcTests/LatencyTest/LatencyTestTypes.h | 4 +- utils/pcTests/LatencyTest/Makefile | 4 +- .../pcTests/LatencyTest/main_LatencyTest.cpp | 4 +- utils/pcTests/NewLogTest/Makefile | 4 +- .../NewLogTest/ReliableCommunicationTest.cpp | 6 +- utils/pcTests/RTIInteroperability/Makefile | 4 +- .../RTIInteroperability.cpp | 4 +- utils/pcTests/ReliableTest/Makefile | 4 +- .../ReliableCommunicationTest.cpp | 12 +- utils/pcTests/StatefulTest/Makefile | 4 +- utils/pcTests/StatefulTest/StatefulTest.cpp | 12 +- utils/pcTests/StatelessTest/Makefile | 4 +- utils/pcTests/StatelessTest/StatelessTest.cpp | 16 +- utils/pcTests/ThriftLatency/ApacheClient.h | 2 +- utils/pcTests/ThriftLatency/ApacheServer.h | 2 +- utils/pcTests/ThriftLatency/main.cpp | 2 +- utils/pcTests/ThroughputTest/Makefile | 4 +- .../ThroughputTest/ThroughputPublisher.cpp | 4 +- .../ThroughputTest/ThroughputPublisher.h | 2 +- .../ThroughputTest/ThroughputSubscriber.cpp | 4 +- .../ThroughputTest/ThroughputSubscriber.h | 4 +- .../ThroughputTest/ThroughputTypes.cpp | 2 +- .../pcTests/ThroughputTest/ThroughputTypes.h | 4 +- .../ThroughputTest/main_ThroughputTest.cpp | 4 +- utils/pcTests/ThroughputTest_release/Makefile | 2 +- .../ThroughputPublisher.cpp | 4 +- .../ThroughputPublisher.h | 2 +- .../ThroughputSubscriber.cpp | 4 +- .../ThroughputSubscriber.h | 4 +- .../ThroughputTest.vcxproj | 16 +- .../ThroughputTypes.cpp | 2 +- .../ThroughputTest_release/ThroughputTypes.h | 4 +- .../main_ThroughputTest.cpp | 4 +- .../LatencyTestPublisher.cpp | 2 +- .../LatencyTestPublisher.h | 2 +- .../LatencyTestSubscriber.cpp | 2 +- .../LatencyTestSubscriber.h | 2 +- .../UpdateAttributesTest/LatencyTestTypes.cpp | 2 +- .../UpdateAttributesTest/LatencyTestTypes.h | 4 +- utils/pcTests/UpdateAttributesTest/Makefile | 4 +- .../main_UpdateAttributes.cpp | 4 +- utils/pcTests/ZeroMQTest/Makefile | 4 +- utils/pcTests/ZeroMQTest/ZeroMQPublisher.cpp | 2 +- utils/pcTests/ZeroMQTest/ZeroMQPublisher.h | 4 +- utils/pcTests/ZeroMQTest/ZeroMQSubscriber.cpp | 2 +- utils/pcTests/ZeroMQTest/ZeroMQSubscriber.h | 4 +- utils/pcTests/ZeroMQTest/main_ZeroMQTest.cpp | 2 +- .../DiscovertyTest/DiscoveryTest.vcxproj | 4 +- utils/pcTests/win32/DomainTest.vcxproj | 4 +- .../win32/StatefulTest/StatefulTest.vcxproj | 4 +- .../StatelessTest1/StatelessTest1.vcxproj | 4 +- .../win32/ZeroMQTest/ZeroMQTest.vcxproj | 4 +- utils/pcTests/win32/pcTests.sln.bat | 4 +- utils/scripts/build_ertps.bat | 2 +- utils/scripts/package_eprosimartps.bat | 2 +- utils/scripts/package_eprosimartps.sh | 2 +- utils/unitTest/Makefile | 4 +- utils/unitTest/ertps/common/test_common.cpp | 4 +- .../ertps/dds/test_DomainParticipant.cpp | 6 +- utils/unitTest/ertps/test_CDRMessage.cpp | 2 +- utils/unitTest/ertps/test_CacheChangePool.cpp | 4 +- utils/unitTest/ertps/test_HistoryCache.cpp | 4 +- utils/unitTest/ertps/test_Participant.cpp | 8 +- utils/unitTest/unit_test.cpp | 4 +- .../HelloWorldTest/HelloWorldPublisher.cpp | 2 +- .../HelloWorldTest/HelloWorldPublisher.h | 4 +- .../HelloWorldTest/HelloWorldSubscriber.cpp | 2 +- .../HelloWorldTest/HelloWorldSubscriber.h | 4 +- .../HelloWorldTest/HelloWorldTest.vcxproj | 16 +- .../HelloWorldTest/HelloWorldType.cpp | 2 +- .../useTests/HelloWorldTest/HelloWorldType.h | 4 +- .../HelloWorldTest/HelloWorld_main.cpp | 4 +- .../useTests/LatencyTest/LatencyTest.vcxproj | 16 +- .../LatencyTest/LatencyTestPublisher.cpp | 2 +- .../LatencyTest/LatencyTestPublisher.h | 2 +- .../LatencyTest/LatencyTestSubscriber.cpp | 2 +- .../LatencyTest/LatencyTestSubscriber.h | 2 +- .../useTests/LatencyTest/LatencyTestTypes.cpp | 2 +- utils/useTests/LatencyTest/LatencyTestTypes.h | 4 +- utils/useTests/LatencyTest/Makefile | 2 +- .../useTests/LatencyTest/main_LatencyTest.cpp | 4 +- utils/useTests/ReliableTest/Makefile | 2 +- .../ReliableCommunicationTest.cpp | 12 +- .../ReliableTest/ReliableTest.vcxproj | 16 +- .../SimplePubSubMain.cxx | 6 +- .../SimplePubSubType.cxx | 4 +- .../SimplePubSubType.h | 6 +- .../SimplePublisher.cxx | 4 +- .../SimplePublisher.h | 6 +- ...PublisherSubscriber-i86Win32VS2010.vcxproj | 16 +- .../SimpleSubscriber.cxx | 4 +- .../SimpleSubscriber.h | 6 +- .../SimpleTypes-i86Win32VS2010.vcxproj | 16 +- win32VS2010/cpp/eRTPS/copyHeaders.bat | 2 +- win32VS2010/cpp/eRTPS/eRTPS.sln.bat | 4 +- win32VS2010/cpp/eRTPS/eRTPS/eRTPS.vcxproj | 228 ++++----- .../cpp/eRTPS/eRTPS/eRTPS.vcxproj.filters | 436 +++++++++--------- win32VS2013/cpp/eRTPS/copyHeaders.bat | 2 +- win32VS2013/cpp/eRTPS/eRTPS.sln.bat | 4 +- win32VS2013/cpp/eRTPS/eRTPS/eRTPS.vcxproj | 262 +++++------ .../cpp/eRTPS/eRTPS/eRTPS.vcxproj.filters | 434 ++++++++--------- 404 files changed, 2700 insertions(+), 2602 deletions(-) delete mode 100644 building/makefiles/eprosimartps.mk create mode 100644 building/makefiles/fastrtps.mk delete mode 100644 include/eprosimartps/config/eprosimartps_dll.h delete mode 100644 include/eprosimartps/pubsub/PUBSUBDomain.h delete mode 100644 include/eprosimartps/pubsub/participant/PUBSUBParticipant.h delete mode 100644 include/eprosimartps/rtps/common/all_common.h delete mode 100644 include/eprosimartps/rtps_all.h create mode 100644 include/fastrtps/Domain.h rename include/{eprosimartps/pubsub => fastrtps}/PUBSUBDomain_old.h (98%) rename include/{eprosimartps/pubsub => fastrtps}/TopicDataType.h (84%) rename include/{eprosimartps/pubsub/attributes/PUBSUBParticipantAttributes.h => fastrtps/attributes/ParticipantAttributes.h} (54%) rename include/{eprosimartps/pubsub => fastrtps}/attributes/PublisherAttributes.h (78%) rename include/{eprosimartps/pubsub => fastrtps}/attributes/SubscriberAttributes.h (85%) rename include/{eprosimartps/pubsub => fastrtps}/attributes/TopicAttributes.h (92%) rename include/{eprosimartps/pubsub => fastrtps}/attributes/all_attributes.h (88%) rename include/{eprosimartps => fastrtps}/config/doxygen_modules.h (89%) rename include/{eprosimartps => fastrtps}/config/eProsima_auto_link.h (100%) rename include/{eprosimartps => fastrtps}/config/eprosima_stl_exports.hpp (96%) create mode 100644 include/fastrtps/config/fastrtps_dll.h create mode 100644 include/fastrtps/fastrtps_all.h rename include/{eprosimartps/eprosimartps_version.h => fastrtps/fastrtps_version.h} (100%) create mode 100644 include/fastrtps/participant/Participant.h rename include/{eprosimartps/pubsub/participant/PUBSUBParticipantImpl.h => fastrtps/participant/ParticipantImpl.h} (60%) rename include/{eprosimartps/pubsub => fastrtps}/publisher/Publisher.h (88%) rename include/{eprosimartps/pubsub => fastrtps}/publisher/PublisherHistory.h (83%) rename include/{eprosimartps/pubsub => fastrtps}/publisher/PublisherImpl.h (87%) rename include/{eprosimartps/pubsub => fastrtps}/publisher/PublisherListener.h (76%) rename include/{eprosimartps/pubsub => fastrtps}/qos/ParameterList.h (86%) rename include/{eprosimartps/pubsub => fastrtps}/qos/ParameterTypes.h (97%) rename include/{eprosimartps/pubsub => fastrtps}/qos/QosList.h (92%) rename include/{eprosimartps/pubsub => fastrtps}/qos/QosPolicies.h (96%) rename include/{eprosimartps/pubsub => fastrtps}/qos/ReaderQos.h (94%) rename include/{eprosimartps/pubsub => fastrtps}/qos/WriterQos.h (94%) rename include/{eprosimartps => fastrtps}/rtps/Endpoint.h (86%) rename include/{eprosimartps => fastrtps}/rtps/RTPSDomain.h (91%) rename include/{eprosimartps => fastrtps}/rtps/attributes/EndpointAttributes.h (90%) rename include/{eprosimartps => fastrtps}/rtps/attributes/HistoryAttributes.h (90%) rename include/{eprosimartps => fastrtps}/rtps/attributes/RTPSParticipantAttributes.h (96%) rename include/{eprosimartps => fastrtps}/rtps/attributes/ReaderAttributes.h (86%) rename include/{eprosimartps => fastrtps}/rtps/attributes/WriterAttributes.h (86%) rename include/{eprosimartps => fastrtps}/rtps/builtin/BuiltinProtocols.h (95%) rename include/{eprosimartps => fastrtps}/rtps/builtin/ParticipantProxyData.h (93%) rename include/{eprosimartps => fastrtps}/rtps/builtin/ReaderProxyData.h (90%) rename include/{eprosimartps => fastrtps}/rtps/builtin/discovery/endpoint/EDP.h (96%) rename include/{eprosimartps => fastrtps}/rtps/builtin/discovery/endpoint/EDPSimple.h (92%) rename include/{eprosimartps => fastrtps}/rtps/builtin/discovery/endpoint/EDPSimpleListeners.h (89%) rename include/{eprosimartps => fastrtps}/rtps/builtin/discovery/endpoint/EDPSimpleTopicDataType.h (86%) rename include/{eprosimartps => fastrtps}/rtps/builtin/discovery/endpoint/EDPStatic.h (95%) rename include/{eprosimartps => fastrtps}/rtps/builtin/discovery/endpoint/EDPStaticXML.h (97%) rename include/{eprosimartps => fastrtps}/rtps/builtin/discovery/participant/PDPSimple.h (95%) rename include/{eprosimartps => fastrtps}/rtps/builtin/discovery/participant/PDPSimpleListener.h (87%) rename include/{eprosimartps => fastrtps}/rtps/builtin/discovery/participant/PDPSimpleTopicDataType.h (86%) rename include/{eprosimartps => fastrtps}/rtps/builtin/discovery/participant/timedevent/RemoteParticipantLeaseDuration.h (90%) rename include/{eprosimartps => fastrtps}/rtps/builtin/discovery/participant/timedevent/ResendParticipantProxyDataPeriod.h (88%) rename include/{eprosimartps => fastrtps}/rtps/builtin/liveliness/WLP.h (89%) rename include/{eprosimartps => fastrtps}/rtps/builtin/liveliness/WLPListener.h (77%) rename include/{eprosimartps => fastrtps}/rtps/builtin/liveliness/WLPTopicDataType.h (81%) rename include/{eprosimartps => fastrtps}/rtps/builtin/liveliness/timedevent/WLivelinessPeriodicAssertion.h (86%) rename include/{eprosimartps => fastrtps}/rtps/common/CDRMessage_t.h (93%) rename include/{eprosimartps => fastrtps}/rtps/common/CacheChange.h (91%) rename include/{eprosimartps => fastrtps}/rtps/common/Guid.h (97%) rename include/{eprosimartps => fastrtps}/rtps/common/InstanceHandle.h (91%) rename include/{eprosimartps => fastrtps}/rtps/common/Locator.h (95%) rename include/{eprosimartps => fastrtps}/rtps/common/MatchingInfo.h (90%) rename include/{eprosimartps => fastrtps}/rtps/common/SequenceNumber.h (96%) rename include/{eprosimartps => fastrtps}/rtps/common/SerializedPayload.h (91%) rename include/{eprosimartps => fastrtps}/rtps/common/Time_t.h (94%) rename include/{eprosimartps => fastrtps}/rtps/common/Types.h (95%) create mode 100644 include/fastrtps/rtps/common/all_common.h rename include/{eprosimartps => fastrtps}/rtps/history/CacheChangePool.h (94%) rename include/{eprosimartps => fastrtps}/rtps/history/History.h (94%) rename include/{eprosimartps => fastrtps}/rtps/history/ReaderHistory.h (94%) rename include/{eprosimartps => fastrtps}/rtps/history/WriterHistory.h (93%) rename include/{eprosimartps => fastrtps}/rtps/messages/CDRMessage.h (95%) rename include/{eprosimartps => fastrtps}/rtps/messages/CDRMessage.hpp (99%) rename include/{eprosimartps => fastrtps}/rtps/messages/CDRMessagePool.h (87%) rename include/{eprosimartps => fastrtps}/rtps/messages/MessageReceiver.h (94%) rename include/{eprosimartps => fastrtps}/rtps/messages/RTPSMessageCreator.h (92%) rename include/{eprosimartps => fastrtps}/rtps/messages/RTPSMessageGroup.h (93%) rename include/{eprosimartps => fastrtps}/rtps/messages/RTPS_messages.h (92%) rename include/{eprosimartps => fastrtps}/rtps/participant/RTPSParticipant.h (90%) rename include/{eprosimartps => fastrtps}/rtps/participant/RTPSParticipantDiscoveryInfo.h (92%) rename include/{eprosimartps => fastrtps}/rtps/participant/RTPSParticipantImpl.h (98%) rename include/{eprosimartps => fastrtps}/rtps/participant/RTPSParticipantListener.h (82%) rename include/{eprosimartps => fastrtps}/rtps/reader/RTPSReader.h (96%) rename include/{eprosimartps => fastrtps}/rtps/reader/ReaderListener.h (85%) rename include/{eprosimartps => fastrtps}/rtps/reader/StatefulReader.h (96%) rename include/{eprosimartps => fastrtps}/rtps/reader/StatelessReader.h (94%) rename include/{eprosimartps => fastrtps}/rtps/reader/WriterProxy.h (91%) rename include/{eprosimartps => fastrtps}/rtps/reader/WriterProxyData.h (87%) rename include/{eprosimartps => fastrtps}/rtps/reader/timedevent/HeartbeatResponseDelay.h (86%) rename include/{eprosimartps => fastrtps}/rtps/reader/timedevent/WriterProxyLiveliness.h (88%) rename include/{eprosimartps => fastrtps}/rtps/resources/ListenResource.h (94%) rename include/{eprosimartps => fastrtps}/rtps/resources/ListenResourceImpl.h (95%) rename include/{eprosimartps => fastrtps}/rtps/resources/ResourceEvent.h (93%) rename include/{eprosimartps => fastrtps}/rtps/resources/ResourceSend.h (91%) rename include/{eprosimartps => fastrtps}/rtps/resources/ResourceSendImpl.h (94%) rename include/{eprosimartps => fastrtps}/rtps/resources/TimedEvent.h (89%) rename include/{eprosimartps => fastrtps}/rtps/resources/TimedEventImpl.h (94%) rename include/{eprosimartps => fastrtps}/rtps/writer/RTPSWriter.h (96%) rename include/{eprosimartps => fastrtps}/rtps/writer/ReaderLocator.h (90%) rename include/{eprosimartps => fastrtps}/rtps/writer/ReaderProxy.h (91%) rename include/{eprosimartps => fastrtps}/rtps/writer/StatefulWriter.h (97%) rename include/{eprosimartps => fastrtps}/rtps/writer/StatelessWriter.h (94%) rename include/{eprosimartps => fastrtps}/rtps/writer/WriterListener.h (79%) rename include/{eprosimartps => fastrtps}/rtps/writer/timedevent/NackResponseDelay.h (82%) rename include/{eprosimartps => fastrtps}/rtps/writer/timedevent/NackSupressionDuration.h (87%) rename include/{eprosimartps => fastrtps}/rtps/writer/timedevent/PeriodicHeartbeat.h (83%) rename include/{eprosimartps => fastrtps}/rtps/writer/timedevent/UnsentChangesNotEmptyEvent.h (86%) rename include/{eprosimartps/pubsub => fastrtps}/subscriber/SampleInfo.h (91%) rename include/{eprosimartps/pubsub => fastrtps}/subscriber/Subscriber.h (95%) rename include/{eprosimartps/pubsub => fastrtps}/subscriber/SubscriberListener.h (88%) rename include/{eprosimartps => fastrtps}/utils/IPFinder.h (90%) rename include/{eprosimartps => fastrtps}/utils/ObjectPool.h (91%) rename include/{eprosimartps => fastrtps}/utils/RTPSLog.h (82%) rename include/{eprosimartps => fastrtps}/utils/StringMatching.h (90%) rename include/{eprosimartps => fastrtps}/utils/TimeConversion.h (95%) rename include/{eprosimartps => fastrtps}/utils/eClock.h (89%) rename include/{eprosimartps => fastrtps}/utils/md5.h (98%) diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index f2b74d07973..0f3129b7648 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -2,7 +2,7 @@ - + diff --git a/Makefile b/Makefile index 7511738afcc..2248b81b36d 100644 --- a/Makefile +++ b/Makefile @@ -10,11 +10,11 @@ LNK=ln -include $(BASEDIR)/thirdparty/dev-env/building/makefiles/eProsima.mk --include $(BASEDIR)/building/makefiles/eprosimartps.mk +-include $(BASEDIR)/building/makefiles/fastrtps.mk .PHONY: all -all: eprosimartps +all: fastrtps clean: @rm -f $(OBJS) diff --git a/building/includes/eprosimartps_includes b/building/includes/eprosimartps_includes index d861c899d1d..84f26a18795 100644 --- a/building/includes/eprosimartps_includes +++ b/building/includes/eprosimartps_includes @@ -29,23 +29,23 @@ common/types/Locator.h common/types/SequenceNumber.h common/types/SerializedPayload.h common/types/Time_t.h -pubsub/attributes/all_attributes.h -pubsub/attributes/RTPSParticipantAttributes.h -pubsub/attributes/PublisherAttributes.h -pubsub/attributes/SubscriberAttributes.h -pubsub/attributes/TopicAttributes.h -pubsub/TopicDataType.h -pubsub/DomainRTPSParticipant.h -pubsub/MatchingInfo.h -pubsub/Publisher.h -pubsub/PublisherListener.h -pubsub/SampleInfo.h -pubsub/Subscriber.h -pubsub/SubscriberListener.h +attributes/all_attributes.h +attributes/RTPSParticipantAttributes.h +attributes/PublisherAttributes.h +attributes/SubscriberAttributes.h +attributes/TopicAttributes.h +TopicDataType.h +DomainRTPSParticipant.h +MatchingInfo.h +Publisher.h +PublisherListener.h +SampleInfo.h +Subscriber.h +SubscriberListener.h Endpoint.h eProsima_auto_link.h -eprosimartps_dll.h -eprosimartps_version.h +fastrtps_dll.h +fastrtps_version.h history/History.h history/ReaderHistory.h history/WriterHistory.h diff --git a/building/makefiles/eprosimartps.mk b/building/makefiles/eprosimartps.mk deleted file mode 100644 index 86ecc87acc7..00000000000 --- a/building/makefiles/eprosimartps.mk +++ /dev/null @@ -1,218 +0,0 @@ -EPROSIMARTPS_OUTDIR= $(OUTDIR)/eprosimartps -EPROSIMARTPS_OUTDIR_DEBUG = $(EPROSIMARTPS_OUTDIR)/debug -EPROSIMARTPS_OUTDIR_RELEASE = $(EPROSIMARTPS_OUTDIR)/release - -EPROSIMADIR= $(BASEDIR)/thirdparty/dev-env - - -# Get product version. -EPROSIMARTPSVERSION=-$(shell $(BASEDIR)/thirdparty/dev-env/scripts/common_pack_functions.sh printVersionFromCPP include/eprosimartps/eprosimartps_version.h) - -EPROSIMARTPS_SED_OUTPUT_DIR_DEBUG= $(subst /,\\/,$(EPROSIMARTPS_OUTDIR_DEBUG)) -EPROSIMARTPS_SED_OUTPUT_DIR_RELEASE= $(subst /,\\/,$(EPROSIMARTPS_OUTDIR_RELEASE)) - -EPROSIMARTPS_TARGET_DEBUG_FILE= libeprosimartpsd$(EPROSIMARTPSVERSION).so -EPROSIMARTPS_TARGET_DEBUG_Z_FILE= libeprosimartpsd$(EPROSIMARTPSVERSION).a -EPROSIMARTPS_TARGET_FILE= libeprosimartps$(EPROSIMARTPSVERSION).so -EPROSIMARTPS_TARGET_Z_FILE= libeprosimartps$(EPROSIMARTPSVERSION).a - -EPROSIMARTPS_TARGET_DEBUG_FILE_LINK= libeprosimartpsd.so -EPROSIMARTPS_TARGET_DEBUG_Z_FILE_LINK= libeprosimartpsd.a -EPROSIMARTPS_TARGET_FILE_LINK= libeprosimartps.so -EPROSIMARTPS_TARGET_Z_FILE_LINK= libeprosimartps.a - -EPROSIMARTPS_TARGET_DEBUG= $(BASEDIR)/lib/$(EPROSIMA_TARGET)/$(EPROSIMARTPS_TARGET_DEBUG_FILE) -EPROSIMARTPS_TARGET_DEBUG_Z= $(BASEDIR)/lib/$(EPROSIMA_TARGET)/$(EPROSIMARTPS_TARGET_DEBUG_Z_FILE) -EPROSIMARTPS_TARGET= $(BASEDIR)/lib/$(EPROSIMA_TARGET)/$(EPROSIMARTPS_TARGET_FILE) -EPROSIMARTPS_TARGET_Z= $(BASEDIR)/lib/$(EPROSIMA_TARGET)/$(EPROSIMARTPS_TARGET_Z_FILE) - -EPROSIMARTPS_CFLAGS += $(CFLAGS) -std=c++0x -O2 -Wno-unknown-pragmas -EPROSIMARTPS_CFLAGS_DEBUG += $(CFLAGS_DEBUG) -std=c++0x -Wno-unknown-pragmas -D__DEBUG - - -EPROSIMARTPS_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/include \ - -I$(BASEDIR)/thirdparty/eprosima-common-code - - -EPROSIMARTPS_SRC_CPPFILES= \ - $(BASEDIR)/thirdparty/eprosima-common-code/eProsima_cpp/log/Log.cpp \ - \ - $(BASEDIR)/src/cpp/utils/eClock.cpp \ - $(BASEDIR)/src/cpp/utils/IPFinder.cpp \ - $(BASEDIR)/src/cpp/utils/md5.cpp \ - $(BASEDIR)/src/cpp/utils/StringMatching.cpp \ - \ - $(BASEDIR)/src/cpp/rtps/participant/RTPSParticipant.cpp \ - $(BASEDIR)/src/cpp/rtps/participant/RTPSParticipantImpl.cpp \ - \ - $(BASEDIR)/src/cpp/rtps/RTPSDomain.cpp \ - \ - $(BASEDIR)/src/cpp/rtps/resources/ListenResourceImpl.cpp \ - $(BASEDIR)/src/cpp/rtps/resources/ListenResource.cpp \ - $(BASEDIR)/src/cpp/rtps/resources/ResourceSend.cpp \ - $(BASEDIR)/src/cpp/rtps/resources/ResourceSendImpl.cpp \ - $(BASEDIR)/src/cpp/rtps/resources/ResourceEvent.cpp \ - $(BASEDIR)/src/cpp/rtps/resources/TimedEvent.cpp \ - $(BASEDIR)/src/cpp/rtps/resources/TimedEventImpl.cpp \ - \ - $(BASEDIR)/src/cpp/rtps/Endpoint.cpp \ - \ - $(BASEDIR)/src/cpp/rtps/writer/RTPSWriter.cpp \ - $(BASEDIR)/src/cpp/rtps/writer/StatefulWriter.cpp \ - $(BASEDIR)/src/cpp/rtps/writer/ReaderProxy.cpp \ - $(BASEDIR)/src/cpp/rtps/writer/StatelessWriter.cpp \ - $(BASEDIR)/src/cpp/rtps/writer/ReaderLocator.cpp \ - $(BASEDIR)/src/cpp/rtps/writer/timedevent/PeriodicHeartbeat.cpp \ - $(BASEDIR)/src/cpp/rtps/writer/timedevent/NackResponseDelay.cpp \ - $(BASEDIR)/src/cpp/rtps/writer/timedevent/NackSupressionDuration.cpp \ - $(BASEDIR)/src/cpp/rtps/writer/timedevent/UnsentChangesNotEmptyEvent.cpp \ - \ - $(BASEDIR)/src/cpp/rtps/history/CacheChangePool.cpp \ - $(BASEDIR)/src/cpp/rtps/history/History.cpp \ - $(BASEDIR)/src/cpp/rtps/history/WriterHistory.cpp \ - \ - $(BASEDIR)/src/cpp/pubsub/PUBSUBDomain.cpp \ - $(BASEDIR)/src/cpp/pubsub/participant/PUBSUBParticipant.cpp \ - $(BASEDIR)/src/cpp/pubsub/participant/PUBSUBParticipantImpl.cpp \ - $(BASEDIR)/src/cpp/pubsub/publisher/Publisher.cpp \ - $(BASEDIR)/src/cpp/pubsub/publisher/PublisherImpl.cpp \ - $(BASEDIR)/src/cpp/pubsub/publisher/PublisherHistory.cpp \ - \ - $(BASEDIR)/src/cpp/utils/IPFinder.cpp \ - $(BASEDIR)/src/cpp/utils/CDRMessagePool.cpp \ - $(BASEDIR)/src/cpp/utils/eClock.cpp \ - $(BASEDIR)/src/cpp/utils/StringMatching.cpp \ - $(BASEDIR)/src/cpp/utils/TimedEvent.cpp \ - $(BASEDIR)/src/cpp/utils/md5.cpp \ - \ - $(BASEDIR)/src/cpp/RTPSMessageCreator.cpp \ - $(BASEDIR)/src/cpp/CacheChangePool.cpp \ - \ - $(BASEDIR)/src/cpp/history/History.cpp \ - $(BASEDIR)/src/cpp/history/WriterHistory.cpp \ - $(BASEDIR)/src/cpp/history/ReaderHistory.cpp \ - \ - $(BASEDIR)/src/cpp/reader/RTPSReader.cpp \ - $(BASEDIR)/src/cpp/reader/StatelessReader.cpp \ - $(BASEDIR)/src/cpp/reader/WriterProxy.cpp \ - $(BASEDIR)/src/cpp/reader/WriterProxyData.cpp \ - $(BASEDIR)/src/cpp/reader/StatefulReader.cpp \ - $(BASEDIR)/src/cpp/reader/timedevent/HeartbeatResponseDelay.cpp \ - $(BASEDIR)/src/cpp/reader/timedevent/WriterProxyLiveliness.cpp \ - \ - $(BASEDIR)/src/cpp/MessageReceiver.cpp \ - $(BASEDIR)/src/cpp/RTPSParticipantProxyData.cpp \ - \ - $(BASEDIR)/src/cpp/resources/ListenResource.cpp \ - $(BASEDIR)/src/cpp/resources/ResourceSend.cpp \ - $(BASEDIR)/src/cpp/resources/ResourceEvent.cpp \ - \ - $(BASEDIR)/src/cpp/pubsub/TopicDataType.cpp \ - $(BASEDIR)/src/cpp/pubsub/Publisher.cpp \ - $(BASEDIR)/src/cpp/pubsub/PublisherListener.cpp \ - $(BASEDIR)/src/cpp/pubsub/Subscriber.cpp \ - $(BASEDIR)/src/cpp/pubsub/SubscriberListener.cpp \ - $(BASEDIR)/src/cpp/pubsub/RTPSDomain.cpp \ - \ - $(BASEDIR)/src/cpp/qos/ParameterList.cpp \ - $(BASEDIR)/src/cpp/qos/ParameterTypes.cpp \ - $(BASEDIR)/src/cpp/qos/QosList.cpp \ - $(BASEDIR)/src/cpp/qos/QosPolicies.cpp \ - $(BASEDIR)/src/cpp/qos/WriterQos.cpp \ - $(BASEDIR)/src/cpp/qos/ReaderQos.cpp \ - \ - $(BASEDIR)/src/cpp/builtin/BuiltinProtocols.cpp \ - \ - $(BASEDIR)/src/cpp/builtin/discovery/RTPSParticipant/PDPSimple.cpp \ - $(BASEDIR)/src/cpp/builtin/discovery/RTPSParticipant/PDPSimpleListener.cpp \ - $(BASEDIR)/src/cpp/builtin/discovery/RTPSParticipant/PDPSimpleTopicDataType.cpp \ - $(BASEDIR)/src/cpp/builtin/discovery/RTPSParticipant/timedevent/RemoteRTPSParticipantLeaseDuration.cpp \ - $(BASEDIR)/src/cpp/builtin/discovery/RTPSParticipant/timedevent/ResendRTPSParticipantProxyDataPeriod.cpp \ - \ - $(BASEDIR)/src/cpp/builtin/discovery/endpoint/EDP.cpp \ - $(BASEDIR)/src/cpp/builtin/discovery/endpoint/EDPSimple.cpp \ - $(BASEDIR)/src/cpp/builtin/discovery/endpoint/EDPSimpleListeners.cpp \ - $(BASEDIR)/src/cpp/builtin/discovery/endpoint/EDPSimpleTopicDataType.cpp \ - \ - $(BASEDIR)/src/cpp/builtin/discovery/endpoint/EDPStaticXML.cpp \ - $(BASEDIR)/src/cpp/builtin/discovery/endpoint/EDPStatic.cpp \ - \ - $(BASEDIR)/src/cpp/builtin/liveliness/WLP.cpp \ - $(BASEDIR)/src/cpp/builtin/liveliness/WLPListener.cpp \ - $(BASEDIR)/src/cpp/builtin/liveliness/WLPTopicDataType.cpp \ - $(BASEDIR)/src/cpp/builtin/liveliness/timedevent/WLivelinessPeriodicAssertion.cpp - - -# Project sources are copied to the current directory -EPROSIMARTPS_SRCS= $(EPROSIMARTPS_SRC_CFILES) $(EPROSIMARTPS_SRC_CPPFILES) - -# Source directories -EPROSIMARTPS_SOURCES_DIRS_AUX= $(foreach srcdir, $(dir $(EPROSIMARTPS_SRCS)), $(srcdir)) -EPROSIMARTPS_SOURCES_DIRS= $(shell echo $(EPROSIMARTPS_SOURCES_DIRS_AUX) | tr " " "\n" | sort | uniq | tr "\n" " ") - -EPROSIMARTPS_OBJS_DEBUG = $(foreach obj,$(notdir $(addsuffix .o, $(basename $(EPROSIMARTPS_SRCS)))), $(EPROSIMARTPS_OUTDIR_DEBUG)/$(obj)) -EPROSIMARTPS_DEPS_DEBUG = $(foreach dep,$(notdir $(addsuffix .d, $(basename $(EPROSIMARTPS_SRCS)))), $(EPROSIMARTPS_OUTDIR_DEBUG)/$(dep)) -EPROSIMARTPS_OBJS_RELEASE = $(foreach obj,$(notdir $(addsuffix .o, $(basename $(EPROSIMARTPS_SRCS)))), $(EPROSIMARTPS_OUTDIR_RELEASE)/$(obj)) -EPROSIMARTPS_DEPS_RELEASE = $(foreach dep,$(notdir $(addsuffix .d, $(basename $(EPROSIMARTPS_SRCS)))), $(EPROSIMARTPS_OUTDIR_RELEASE)/$(dep)) - -OBJS+= $(EPROSIMARTPS_OBJS_DEBUG) $(EPROSIMARTPS_OBJS_RELEASE) -DEPS+= $(EPROSIMARTPS_DEPS_DEBUG) $(EPROSIMARTPS_DEPS_RELEASE) - -.PHONY: eprosimartps checkEPROSIMARTPSDirectories - -eprosimartps: checkEPROSIMARTPSDirectories $(EPROSIMARTPS_TARGET_DEBUG) $(EPROSIMARTPS_TARGET_DEBUG_Z) $(EPROSIMARTPS_TARGET) $(EPROSIMARTPS_TARGET_Z) - -checkEPROSIMARTPSDirectories: - @mkdir -p $(OUTDIR) - @mkdir -p $(EPROSIMARTPS_OUTDIR) - @mkdir -p $(EPROSIMARTPS_OUTDIR_DEBUG) - @mkdir -p $(EPROSIMARTPS_OUTDIR_RELEASE) - @mkdir -p lib - @mkdir -p lib/$(EPROSIMA_TARGET) -ifdef EPROSIMA_LIBRARY_PATH - @mkdir -p $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET) -endif -$(EPROSIMARTPS_TARGET_DEBUG): $(EPROSIMARTPS_OBJS_DEBUG) - $(LN) $(LDFLAGS) -shared -o $(EPROSIMARTPS_TARGET_DEBUG) $(LIBRARY_PATH) $(LIBS_DEBUG) $(EPROSIMARTPS_OBJS_DEBUG) - $(LNK) -s -f $(EPROSIMARTPS_TARGET_DEBUG_FILE) $(BASEDIR)/lib/$(EPROSIMA_TARGET)/$(EPROSIMARTPS_TARGET_DEBUG_FILE_LINK) -ifdef EPROSIMA_LIBRARY_PATH - $(CP) $(EPROSIMARTPS_TARGET_DEBUG) $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET) - $(LNK) -s -f $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET)/$(EPROSIMARTPS_TARGET_DEBUG_FILE) $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET)/$(EPROSIMARTPS_TARGET_DEBUG_FILE_LINK) -endif - -$(EPROSIMARTPS_TARGET_DEBUG_Z): $(EPROSIMARTPS_OBJS_DEBUG) - $(AR) -cru $(EPROSIMARTPS_TARGET_DEBUG_Z) $(EPROSIMARTPS_OBJS_DEBUG) - $(LNK) -s -f $(EPROSIMARTPS_TARGET_DEBUG_Z_FILE) $(BASEDIR)/lib/$(EPROSIMA_TARGET)/$(EPROSIMARTPS_TARGET_DEBUG_Z_FILE_LINK) -ifdef EPROSIMA_LIBRARY_PATH - $(CP) $(EPROSIMARTPS_TARGET_DEBUG_Z) $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET) - $(LNK) -s -f $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET)/$(EPROSIMARTPS_TARGET_DEBUG_Z_FILE) $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET)/$(EPROSIMARTPS_TARGET_DEBUG_Z_FILE_LINK) -endif -$(EPROSIMARTPS_TARGET): $(EPROSIMARTPS_OBJS_RELEASE) - $(LN) $(LDFLAGS) -shared -o $(EPROSIMARTPS_TARGET) $(LIBRARY_PATH) $(LIBS) $(EPROSIMARTPS_OBJS_RELEASE) - $(LNK) -s -f $(EPROSIMARTPS_TARGET_FILE) $(BASEDIR)/lib/$(EPROSIMA_TARGET)/$(EPROSIMARTPS_TARGET_FILE_LINK) -ifdef EPROSIMA_LIBRARY_PATH - $(CP) $(EPROSIMARTPS_TARGET) $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET) - $(LNK) -s -f $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET)/$(EPROSIMARTPS_TARGET_FILE) $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET)/$(EPROSIMARTPS_TARGET_FILE_LINK) -endif -$(EPROSIMARTPS_TARGET_Z): $(EPROSIMARTPS_OBJS_RELEASE) - $(AR) -cru $(EPROSIMARTPS_TARGET_Z) $(EPROSIMARTPS_OBJS_RELEASE) - $(LNK) -s -f $(EPROSIMARTPS_TARGET_Z_FILE) $(BASEDIR)/lib/$(EPROSIMA_TARGET)/$(EPROSIMARTPS_TARGET_Z_FILE_LINK) -ifdef EPROSIMA_LIBRARY_PATH - $(CP) $(EPROSIMARTPS_TARGET_Z) $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET) - $(LNK) -s -f $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET)/$(EPROSIMARTPS_TARGET_Z_FILE) $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET)/$(EPROSIMARTPS_TARGET_Z_FILE_LINK) -endif -vpath %.cpp $(EPROSIMARTPS_SOURCES_DIRS) - -$(EPROSIMARTPS_OUTDIR_DEBUG)/%.o:%.cpp - @echo Calculating dependencies \(DEBUG mode\) $< - @$(CPP) $(EPROSIMARTPS_CFLAGS_DEBUG) -MM $(EPROSIMARTPS_INCLUDE_DIRS) $< | sed "s/^.*:/$(EPROSIMARTPS_SED_OUTPUT_DIR_DEBUG)\/&/g" > $(@:%.o=%.d) - @echo Compiling \(DEBUG mode\) $< - $(CPP) $(EPROSIMARTPS_CFLAGS_DEBUG) $(EPROSIMARTPS_INCLUDE_DIRS) $< -o $@ - -$(EPROSIMARTPS_OUTDIR_RELEASE)/%.o:%.cpp - @echo Calculating dependencies \(RELEASE mode\) $< - @$(CPP) $(EPROSIMARTPS_CFLAGS) -MM $(EPROSIMARTPS_INCLUDE_DIRS) $< | sed "s/^.*:/$(EPROSIMARTPS_SED_OUTPUT_DIR_RELEASE)\/&/g" > $(@:%.o=%.d) - @echo Compiling \(RELEASE mode\) $< - $(CPP) $(EPROSIMARTPS_CFLAGS) $(EPROSIMARTPS_INCLUDE_DIRS) $< -o $@ - - diff --git a/building/makefiles/eprosimartps_sources b/building/makefiles/eprosimartps_sources index 69b0f34835a..22dc37ae320 100644 --- a/building/makefiles/eprosimartps_sources +++ b/building/makefiles/eprosimartps_sources @@ -35,12 +35,12 @@ src/cpp/RTPSParticipantProxyData.cpp src/cpp/resources/ListenResource.cpp src/cpp/resources/ResourceSend.cpp src/cpp/resources/ResourceEvent.cpp -src/cpp/pubsub/TopicDataType.cpp -src/cpp/pubsub/Publisher.cpp -src/cpp/pubsub/PublisherListener.cpp -src/cpp/pubsub/Subscriber.cpp -src/cpp/pubsub/SubscriberListener.cpp -src/cpp/pubsub/RTPSDomain.cpp +src/cpp/TopicDataType.cpp +src/cpp/Publisher.cpp +src/cpp/PublisherListener.cpp +src/cpp/Subscriber.cpp +src/cpp/SubscriberListener.cpp +src/cpp/RTPSDomain.cpp src/cpp/qos/ParameterList.cpp src/cpp/qos/ParameterTypes.cpp src/cpp/qos/QosList.cpp diff --git a/building/makefiles/fastrtps.mk b/building/makefiles/fastrtps.mk new file mode 100644 index 00000000000..c4287b82f72 --- /dev/null +++ b/building/makefiles/fastrtps.mk @@ -0,0 +1,218 @@ +FASTRTPS_OUTDIR= $(OUTDIR)/fastrtps +FASTRTPS_OUTDIR_DEBUG = $(FASTRTPS_OUTDIR)/debug +FASTRTPS_OUTDIR_RELEASE = $(FASTRTPS_OUTDIR)/release + +EPROSIMADIR= $(BASEDIR)/thirdparty/dev-env + + +# Get product version. +FASTRTPSVERSION=-$(shell $(BASEDIR)/thirdparty/dev-env/scripts/common_pack_functions.sh printVersionFromCPP include/fastrtps/fastrtps_version.h) + +FASTRTPS_SED_OUTPUT_DIR_DEBUG= $(subst /,\\/,$(FASTRTPS_OUTDIR_DEBUG)) +FASTRTPS_SED_OUTPUT_DIR_RELEASE= $(subst /,\\/,$(FASTRTPS_OUTDIR_RELEASE)) + +FASTRTPS_TARGET_DEBUG_FILE= libfastrtpsd$(FASTRTPSVERSION).so +FASTRTPS_TARGET_DEBUG_Z_FILE= libfastrtpsd$(FASTRTPSVERSION).a +FASTRTPS_TARGET_FILE= libfastrtps$(FASTRTPSVERSION).so +FASTRTPS_TARGET_Z_FILE= libfastrtps$(FASTRTPSVERSION).a + +FASTRTPS_TARGET_DEBUG_FILE_LINK= libfastrtpsd.so +FASTRTPS_TARGET_DEBUG_Z_FILE_LINK= libfastrtpsd.a +FASTRTPS_TARGET_FILE_LINK= libfastrtps.so +FASTRTPS_TARGET_Z_FILE_LINK= libfastrtps.a + +FASTRTPS_TARGET_DEBUG= $(BASEDIR)/lib/$(EPROSIMA_TARGET)/$(FASTRTPS_TARGET_DEBUG_FILE) +FASTRTPS_TARGET_DEBUG_Z= $(BASEDIR)/lib/$(EPROSIMA_TARGET)/$(FASTRTPS_TARGET_DEBUG_Z_FILE) +FASTRTPS_TARGET= $(BASEDIR)/lib/$(EPROSIMA_TARGET)/$(FASTRTPS_TARGET_FILE) +FASTRTPS_TARGET_Z= $(BASEDIR)/lib/$(EPROSIMA_TARGET)/$(FASTRTPS_TARGET_Z_FILE) + +FASTRTPS_CFLAGS += $(CFLAGS) -std=c++0x -O2 -Wno-unknown-pragmas +FASTRTPS_CFLAGS_DEBUG += $(CFLAGS_DEBUG) -std=c++0x -Wno-unknown-pragmas -D__DEBUG + + +FASTRTPS_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/include \ + -I$(BASEDIR)/thirdparty/eprosima-common-code + + +FASTRTPS_SRC_CPPFILES= \ + $(BASEDIR)/thirdparty/eprosima-common-code/eProsima_cpp/log/Log.cpp \ + \ + $(BASEDIR)/src/cpp/utils/eClock.cpp \ + $(BASEDIR)/src/cpp/utils/IPFinder.cpp \ + $(BASEDIR)/src/cpp/utils/md5.cpp \ + $(BASEDIR)/src/cpp/utils/StringMatching.cpp \ + \ + $(BASEDIR)/src/cpp/rtps/resources/ListenResourceImpl.cpp \ + $(BASEDIR)/src/cpp/rtps/resources/ListenResource.cpp \ + $(BASEDIR)/src/cpp/rtps/resources/ResourceSend.cpp \ + $(BASEDIR)/src/cpp/rtps/resources/ResourceSendImpl.cpp \ + $(BASEDIR)/src/cpp/rtps/resources/ResourceEvent.cpp \ + $(BASEDIR)/src/cpp/rtps/resources/TimedEvent.cpp \ + $(BASEDIR)/src/cpp/rtps/resources/TimedEventImpl.cpp \ + \ + $(BASEDIR)/src/cpp/rtps/Endpoint.cpp \ + \ + $(BASEDIR)/src/cpp/rtps/writer/RTPSWriter.cpp \ + $(BASEDIR)/src/cpp/rtps/writer/StatefulWriter.cpp \ + $(BASEDIR)/src/cpp/rtps/writer/ReaderProxy.cpp \ + $(BASEDIR)/src/cpp/rtps/writer/StatelessWriter.cpp \ + $(BASEDIR)/src/cpp/rtps/writer/ReaderLocator.cpp \ + $(BASEDIR)/src/cpp/rtps/writer/timedevent/PeriodicHeartbeat.cpp \ + $(BASEDIR)/src/cpp/rtps/writer/timedevent/NackResponseDelay.cpp \ + $(BASEDIR)/src/cpp/rtps/writer/timedevent/NackSupressionDuration.cpp \ + $(BASEDIR)/src/cpp/rtps/writer/timedevent/UnsentChangesNotEmptyEvent.cpp \ + \ + $(BASEDIR)/src/cpp/rtps/history/CacheChangePool.cpp \ + $(BASEDIR)/src/cpp/rtps/history/History.cpp \ + $(BASEDIR)/src/cpp/rtps/history/WriterHistory.cpp \ + \ + $(BASEDIR)/src/cpp/rtps/participant/RTPSParticipant.cpp \ + $(BASEDIR)/src/cpp/rtps/participant/RTPSParticipantImpl.cpp \ + \ + $(BASEDIR)/src/cpp/rtps/RTPSDomain.cpp \ + \ + $(BASEDIR)/src/cpp/Domain.cpp \ + $(BASEDIR)/src/cpp/participant/Participant.cpp \ + $(BASEDIR)/src/cpp/participant/ParticipantImpl.cpp \ + $(BASEDIR)/src/cpp/publisher/Publisher.cpp \ + $(BASEDIR)/src/cpp/publisher/PublisherImpl.cpp \ + $(BASEDIR)/src/cpp/publisher/PublisherHistory.cpp \ + \ + $(BASEDIR)/src/cpp/utils/IPFinder.cpp \ + $(BASEDIR)/src/cpp/utils/CDRMessagePool.cpp \ + $(BASEDIR)/src/cpp/utils/eClock.cpp \ + $(BASEDIR)/src/cpp/utils/StringMatching.cpp \ + $(BASEDIR)/src/cpp/utils/TimedEvent.cpp \ + $(BASEDIR)/src/cpp/utils/md5.cpp \ + \ + $(BASEDIR)/src/cpp/RTPSMessageCreator.cpp \ + $(BASEDIR)/src/cpp/CacheChangePool.cpp \ + \ + $(BASEDIR)/src/cpp/history/History.cpp \ + $(BASEDIR)/src/cpp/history/WriterHistory.cpp \ + $(BASEDIR)/src/cpp/history/ReaderHistory.cpp \ + \ + $(BASEDIR)/src/cpp/reader/RTPSReader.cpp \ + $(BASEDIR)/src/cpp/reader/StatelessReader.cpp \ + $(BASEDIR)/src/cpp/reader/WriterProxy.cpp \ + $(BASEDIR)/src/cpp/reader/WriterProxyData.cpp \ + $(BASEDIR)/src/cpp/reader/StatefulReader.cpp \ + $(BASEDIR)/src/cpp/reader/timedevent/HeartbeatResponseDelay.cpp \ + $(BASEDIR)/src/cpp/reader/timedevent/WriterProxyLiveliness.cpp \ + \ + $(BASEDIR)/src/cpp/MessageReceiver.cpp \ + $(BASEDIR)/src/cpp/RTPSParticipantProxyData.cpp \ + \ + $(BASEDIR)/src/cpp/resources/ListenResource.cpp \ + $(BASEDIR)/src/cpp/resources/ResourceSend.cpp \ + $(BASEDIR)/src/cpp/resources/ResourceEvent.cpp \ + \ + $(BASEDIR)/src/cpp/pubsub/TopicDataType.cpp \ + $(BASEDIR)/src/cpp/pubsub/Publisher.cpp \ + $(BASEDIR)/src/cpp/pubsub/PublisherListener.cpp \ + $(BASEDIR)/src/cpp/pubsub/Subscriber.cpp \ + $(BASEDIR)/src/cpp/pubsub/SubscriberListener.cpp \ + $(BASEDIR)/src/cpp/pubsub/RTPSDomain.cpp \ + \ + $(BASEDIR)/src/cpp/qos/ParameterList.cpp \ + $(BASEDIR)/src/cpp/qos/ParameterTypes.cpp \ + $(BASEDIR)/src/cpp/qos/QosList.cpp \ + $(BASEDIR)/src/cpp/qos/QosPolicies.cpp \ + $(BASEDIR)/src/cpp/qos/WriterQos.cpp \ + $(BASEDIR)/src/cpp/qos/ReaderQos.cpp \ + \ + $(BASEDIR)/src/cpp/builtin/BuiltinProtocols.cpp \ + \ + $(BASEDIR)/src/cpp/builtin/discovery/RTPSParticipant/PDPSimple.cpp \ + $(BASEDIR)/src/cpp/builtin/discovery/RTPSParticipant/PDPSimpleListener.cpp \ + $(BASEDIR)/src/cpp/builtin/discovery/RTPSParticipant/PDPSimpleTopicDataType.cpp \ + $(BASEDIR)/src/cpp/builtin/discovery/RTPSParticipant/timedevent/RemoteRTPSParticipantLeaseDuration.cpp \ + $(BASEDIR)/src/cpp/builtin/discovery/RTPSParticipant/timedevent/ResendRTPSParticipantProxyDataPeriod.cpp \ + \ + $(BASEDIR)/src/cpp/builtin/discovery/endpoint/EDP.cpp \ + $(BASEDIR)/src/cpp/builtin/discovery/endpoint/EDPSimple.cpp \ + $(BASEDIR)/src/cpp/builtin/discovery/endpoint/EDPSimpleListeners.cpp \ + $(BASEDIR)/src/cpp/builtin/discovery/endpoint/EDPSimpleTopicDataType.cpp \ + \ + $(BASEDIR)/src/cpp/builtin/discovery/endpoint/EDPStaticXML.cpp \ + $(BASEDIR)/src/cpp/builtin/discovery/endpoint/EDPStatic.cpp \ + \ + $(BASEDIR)/src/cpp/builtin/liveliness/WLP.cpp \ + $(BASEDIR)/src/cpp/builtin/liveliness/WLPListener.cpp \ + $(BASEDIR)/src/cpp/builtin/liveliness/WLPTopicDataType.cpp \ + $(BASEDIR)/src/cpp/builtin/liveliness/timedevent/WLivelinessPeriodicAssertion.cpp + + +# Project sources are copied to the current directory +FASTRTPS_SRCS= $(FASTRTPS_SRC_CFILES) $(FASTRTPS_SRC_CPPFILES) + +# Source directories +FASTRTPS_SOURCES_DIRS_AUX= $(foreach srcdir, $(dir $(FASTRTPS_SRCS)), $(srcdir)) +FASTRTPS_SOURCES_DIRS= $(shell echo $(FASTRTPS_SOURCES_DIRS_AUX) | tr " " "\n" | sort | uniq | tr "\n" " ") + +FASTRTPS_OBJS_DEBUG = $(foreach obj,$(notdir $(addsuffix .o, $(basename $(FASTRTPS_SRCS)))), $(FASTRTPS_OUTDIR_DEBUG)/$(obj)) +FASTRTPS_DEPS_DEBUG = $(foreach dep,$(notdir $(addsuffix .d, $(basename $(FASTRTPS_SRCS)))), $(FASTRTPS_OUTDIR_DEBUG)/$(dep)) +FASTRTPS_OBJS_RELEASE = $(foreach obj,$(notdir $(addsuffix .o, $(basename $(FASTRTPS_SRCS)))), $(FASTRTPS_OUTDIR_RELEASE)/$(obj)) +FASTRTPS_DEPS_RELEASE = $(foreach dep,$(notdir $(addsuffix .d, $(basename $(FASTRTPS_SRCS)))), $(FASTRTPS_OUTDIR_RELEASE)/$(dep)) + +OBJS+= $(FASTRTPS_OBJS_DEBUG) $(FASTRTPS_OBJS_RELEASE) +DEPS+= $(FASTRTPS_DEPS_DEBUG) $(FASTRTPS_DEPS_RELEASE) + +.PHONY: FASTRTPS checkFASTRTPSDirectories + +FASTRTPS: checkFASTRTPSDirectories $(FASTRTPS_TARGET_DEBUG) $(FASTRTPS_TARGET_DEBUG_Z) $(FASTRTPS_TARGET) $(FASTRTPS_TARGET_Z) + +checkFASTRTPSDirectories: + @mkdir -p $(OUTDIR) + @mkdir -p $(FASTRTPS_OUTDIR) + @mkdir -p $(FASTRTPS_OUTDIR_DEBUG) + @mkdir -p $(FASTRTPS_OUTDIR_RELEASE) + @mkdir -p lib + @mkdir -p lib/$(EPROSIMA_TARGET) +ifdef EPROSIMA_LIBRARY_PATH + @mkdir -p $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET) +endif +$(FASTRTPS_TARGET_DEBUG): $(FASTRTPS_OBJS_DEBUG) + $(LN) $(LDFLAGS) -shared -o $(FASTRTPS_TARGET_DEBUG) $(LIBRARY_PATH) $(LIBS_DEBUG) $(FASTRTPS_OBJS_DEBUG) + $(LNK) -s -f $(FASTRTPS_TARGET_DEBUG_FILE) $(BASEDIR)/lib/$(EPROSIMA_TARGET)/$(FASTRTPS_TARGET_DEBUG_FILE_LINK) +ifdef EPROSIMA_LIBRARY_PATH + $(CP) $(FASTRTPS_TARGET_DEBUG) $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET) + $(LNK) -s -f $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET)/$(FASTRTPS_TARGET_DEBUG_FILE) $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET)/$(FASTRTPS_TARGET_DEBUG_FILE_LINK) +endif + +$(FASTRTPS_TARGET_DEBUG_Z): $(FASTRTPS_OBJS_DEBUG) + $(AR) -cru $(FASTRTPS_TARGET_DEBUG_Z) $(FASTRTPS_OBJS_DEBUG) + $(LNK) -s -f $(FASTRTPS_TARGET_DEBUG_Z_FILE) $(BASEDIR)/lib/$(EPROSIMA_TARGET)/$(FASTRTPS_TARGET_DEBUG_Z_FILE_LINK) +ifdef EPROSIMA_LIBRARY_PATH + $(CP) $(FASTRTPS_TARGET_DEBUG_Z) $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET) + $(LNK) -s -f $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET)/$(FASTRTPS_TARGET_DEBUG_Z_FILE) $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET)/$(FASTRTPS_TARGET_DEBUG_Z_FILE_LINK) +endif +$(FASTRTPS_TARGET): $(FASTRTPS_OBJS_RELEASE) + $(LN) $(LDFLAGS) -shared -o $(FASTRTPS_TARGET) $(LIBRARY_PATH) $(LIBS) $(FASTRTPS_OBJS_RELEASE) + $(LNK) -s -f $(FASTRTPS_TARGET_FILE) $(BASEDIR)/lib/$(EPROSIMA_TARGET)/$(FASTRTPS_TARGET_FILE_LINK) +ifdef EPROSIMA_LIBRARY_PATH + $(CP) $(FASTRTPS_TARGET) $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET) + $(LNK) -s -f $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET)/$(FASTRTPS_TARGET_FILE) $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET)/$(FASTRTPS_TARGET_FILE_LINK) +endif +$(FASTRTPS_TARGET_Z): $(FASTRTPS_OBJS_RELEASE) + $(AR) -cru $(FASTRTPS_TARGET_Z) $(FASTRTPS_OBJS_RELEASE) + $(LNK) -s -f $(FASTRTPS_TARGET_Z_FILE) $(BASEDIR)/lib/$(EPROSIMA_TARGET)/$(FASTRTPS_TARGET_Z_FILE_LINK) +ifdef EPROSIMA_LIBRARY_PATH + $(CP) $(FASTRTPS_TARGET_Z) $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET) + $(LNK) -s -f $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET)/$(FASTRTPS_TARGET_Z_FILE) $(EPROSIMA_LIBRARY_PATH)/proyectos/$(EPROSIMA_TARGET)/$(FASTRTPS_TARGET_Z_FILE_LINK) +endif +vpath %.cpp $(FASTRTPS_SOURCES_DIRS) + +$(FASTRTPS_OUTDIR_DEBUG)/%.o:%.cpp + @echo Calculating dependencies \(DEBUG mode\) $< + @$(CPP) $(FASTRTPS_CFLAGS_DEBUG) -MM $(FASTRTPS_INCLUDE_DIRS) $< | sed "s/^.*:/$(FASTRTPS_SED_OUTPUT_DIR_DEBUG)\/&/g" > $(@:%.o=%.d) + @echo Compiling \(DEBUG mode\) $< + $(CPP) $(FASTRTPS_CFLAGS_DEBUG) $(FASTRTPS_INCLUDE_DIRS) $< -o $@ + +$(FASTRTPS_OUTDIR_RELEASE)/%.o:%.cpp + @echo Calculating dependencies \(RELEASE mode\) $< + @$(CPP) $(FASTRTPS_CFLAGS) -MM $(FASTRTPS_INCLUDE_DIRS) $< | sed "s/^.*:/$(FASTRTPS_SED_OUTPUT_DIR_RELEASE)\/&/g" > $(@:%.o=%.d) + @echo Compiling \(RELEASE mode\) $< + $(CPP) $(FASTRTPS_CFLAGS) $(FASTRTPS_INCLUDE_DIRS) $< -o $@ + + diff --git a/include/eprosimartps/config/eprosimartps_dll.h b/include/eprosimartps/config/eprosimartps_dll.h deleted file mode 100644 index 8acf74f4e36..00000000000 --- a/include/eprosimartps/config/eprosimartps_dll.h +++ /dev/null @@ -1,63 +0,0 @@ -/************************************************************************* - * Copyright (c) 201 4 eProsima. All rights reserved. - * - * This copy of EprosimaRTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. - * - *************************************************************************/ - -#ifndef _EPROSIMARTPS_EPROSIMARTPS_DLL_H_ -#define _EPROSIMARTPS_EPROSIMARTPS_DLL_H_ - -// normalize macros -#if !defined(EPROSIMARTPS_DYN_LINK) && !defined(EPROSIMARTPS_STATIC_LINK) \ - && !defined(EPROSIMA_ALL_DYN_LINK) && !defined(EPROSIMA_ALL_STATIC_LINK) -#define EPROSIMARTPS_STATIC_LINK -#endif - -#if defined(EPROSIMA_ALL_DYN_LINK) && !defined(EPROSIMARTPS_DYN_LINK) -#define EPROSIMARTPS_DYN_LINK -#endif - -#if defined(EPROSIMARTPS_DYN_LINK) && defined(EPROSIMARTPS_STATIC_LINK) -#error Must not define both EPROSIMARTPS_DYN_LINK and EPROSIMARTPS_STATIC_LINK -#endif - -#if defined(EPROSIMA_ALL_NO_LIB) && !defined(EPROSIMARTPS_NO_LIB) -#define EPROSIMARTPS_NO_LIB -#endif - -// enable dynamic linking - -#if defined(_WIN32) -#if defined(EPROSIMA_ALL_DYN_LINK) || defined(EPROSIMARTPS_DYN_LINK) -#if defined(EPROSIMARTPS_SOURCE) -#define RTPS_DllAPI __declspec( dllexport ) -#else -#define RTPS_DllAPI __declspec( dllimport ) -#endif // EPROSIMARTPS_SOURCE -#else -#define RTPS_DllAPI -#endif -#else -#define RTPS_DllAPI -#endif // _WIN32 - -// Auto linking. - -#if !defined(EPROSIMARTPS_SOURCE) && !defined(EPROSIMA_ALL_NO_LIB) \ - && !defined(EPROSIMARTPS_NO_LIB) - -#include "eprosimartps/eprosimartps_version.h" - -// Set properties. -#define EPROSIMA_LIB_NAME eprosimartps - -#if defined(EPROSIMA_ALL_DYN_LINK) || defined(EPROSIMARTPS_DYN_LINK) -#define EPROSIMA_DYN_LINK -#endif - -#include "eprosimartps/config/eProsima_auto_link.h" -#endif // auto-linking disabled - -#endif // _EPROSIMARTPS_EPROSIMARTPS_DLL_H_ diff --git a/include/eprosimartps/pubsub/PUBSUBDomain.h b/include/eprosimartps/pubsub/PUBSUBDomain.h deleted file mode 100644 index 94514ef9664..00000000000 --- a/include/eprosimartps/pubsub/PUBSUBDomain.h +++ /dev/null @@ -1,56 +0,0 @@ -/************************************************************************* - * Copyright (c) 2014 eProsima. All rights reserved. - * - * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. - * - *************************************************************************/ - -/** - * @file PUBSUBDomain.h - * - */ - -#ifndef PUBSUBDOMAIN_H_ -#define PUBSUBDOMAIN_H_ - -#include "eprosimartps/rtps/attributes/RTPSParticipantAttributes.h" - -namespace eprosima -{ -namespace rtps -{ -class RTPSParticipantListener; -} -} - -using namespace eprosima::rtps; - -namespace eprosima { -namespace pubsub { - -class PUBSUBParticipant; -class PUBSUBParticipantImpl; -class Publisher; -class PublisherAttributes; -class PublisherListener; - -class PUBSUBDomain -{ - typedef std::pair t_p_PUBSUBParticipant; -public: - PUBSUBDomain(); - virtual ~PUBSUBDomain(); - static PUBSUBParticipant* createParticipant(RTPSParticipantAttributes& att,RTPSParticipantListener* listen = nullptr); - - static Publisher* createPublisher(PUBSUBParticipant* part,PublisherAttributes& att, PublisherListener* listen = nullptr); - - static std::vector m_pubsubParticipants; - - -}; - -} /* namespace pubsub */ -} /* namespace eprosima */ - -#endif /* PUBSUBDOMAIN_H_ */ diff --git a/include/eprosimartps/pubsub/participant/PUBSUBParticipant.h b/include/eprosimartps/pubsub/participant/PUBSUBParticipant.h deleted file mode 100644 index be85577ffdb..00000000000 --- a/include/eprosimartps/pubsub/participant/PUBSUBParticipant.h +++ /dev/null @@ -1,48 +0,0 @@ -/************************************************************************* - * Copyright (c) 2014 eProsima. All rights reserved. - * - * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. - * - *************************************************************************/ - -/** - * @file PUBSUBParticipant.h - * - */ - -#ifndef PUBSUBPARTICIPANT_H_ -#define PUBSUBPARTICIPANT_H_ - -#include "eprosimartps/rtps/common/Guid.h" - -#include "eprosimartps/rtps/attributes/RTPSParticipantAttributes.h" - -using namespace eprosima::rtps; - -namespace eprosima { -namespace pubsub { - -class PUBSUBParticipantImpl; - - -class PUBSUBParticipant { - friend class PUBSUBDomain; - friend class PUBSUBParticipantImpl; -private: - PUBSUBParticipant(); - virtual ~PUBSUBParticipant(); - - - PUBSUBParticipantImpl* mp_impl; - -public: - - const GUID_t& getGuid()const ; - -}; - -} /* namespace pubsub */ -} /* namespace eprosima */ - -#endif /* PUBSUBPARTICIPANT_H_ */ diff --git a/include/eprosimartps/rtps/common/all_common.h b/include/eprosimartps/rtps/common/all_common.h deleted file mode 100644 index b77545e2f76..00000000000 --- a/include/eprosimartps/rtps/common/all_common.h +++ /dev/null @@ -1,28 +0,0 @@ -/************************************************************************* - * Copyright (c) 2014 eProsima. All rights reserved. - * - * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. - * - *************************************************************************/ - -/** - * @file all_common.h - */ - -#ifndef ALL_COMMON_H_ -#define ALL_COMMON_H_ - -#include "eprosimartps/rtps/common/Types.h" -#include "eprosimartps/rtps/common/CDRMessage_t.h" -#include "eprosimartps/rtps/common/Guid.h" -#include "eprosimartps/rtps/common/InstanceHandle.h" -#include "eprosimartps/rtps/common/Locator.h" -#include "eprosimartps/rtps/common/SequenceNumber.h" -#include "eprosimartps/rtps/common/SerializedPayload.h" -#include "eprosimartps/rtps/common/Time_t.h" -#include "eprosimartps/rtps/common/CacheChange.h" - - - -#endif /* ALL_COMMON_H_ */ diff --git a/include/eprosimartps/rtps_all.h b/include/eprosimartps/rtps_all.h deleted file mode 100644 index 6612832342b..00000000000 --- a/include/eprosimartps/rtps_all.h +++ /dev/null @@ -1,46 +0,0 @@ -/************************************************************************* - * Copyright (c) 2014 eProsima. All rights reserved. - * - * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. - * - *************************************************************************/ - -/** - * @file rtps_all.h - * - */ - -#ifndef RTPS_ALL_H_ -#define RTPS_ALL_H_ - -//USE THIS HEADER WITH CAUTION. -//IT INCLUDES ALL NECESSARY ELEMENTS TO COMPILE A TESTS USING THE PUBLIC API. - -#include "eprosimartps/common/types/all_common.h" - -#include "eprosimartps/pubsub/attributes/all_attributes.h" -#include "eprosimartps/RTPSParticipant.h" -#include "eprosimartps/pubsub/TopicDataType.h" -#include "eprosimartps/pubsub/RTPSDomain.h" -#include "eprosimartps/pubsub/Publisher.h" -#include "eprosimartps/pubsub/Subscriber.h" -#include "eprosimartps/pubsub/PublisherListener.h" -#include "eprosimartps/pubsub/SubscriberListener.h" -#include "eprosimartps/pubsub/RTPSParticipantListener.h" - -#include "eprosimartps/pubsub/SampleInfo.h" - -#include "eprosimartps/utils/IPFinder.h" -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/utils/eClock.h" -#include "eprosimartps/utils/TimeConversion.h" - -#include "eprosimartps/qos/ParameterList.h" -#include "eprosimartps/qos/QosPolicies.h" - -using namespace eprosima; -using namespace pubsub; -using namespace rtps; - -#endif /* RTPS_ALL_H_ */ diff --git a/include/fastrtps/Domain.h b/include/fastrtps/Domain.h new file mode 100644 index 00000000000..5ede875dd3e --- /dev/null +++ b/include/fastrtps/Domain.h @@ -0,0 +1,56 @@ +/************************************************************************* + * Copyright (c) 2014 eProsima. All rights reserved. + * + * This copy of eProsima RTPS is licensed to you under the terms described in the + * fastrtps_LIBRARY_LICENSE file included in this distribution. + * + *************************************************************************/ + +/** + * @file Domain.h + * + */ + +#ifndef DOMAIN_H_ +#define DOMAIN_H_ + +#include "fastrtps/rtps/attributes/RTPSParticipantAttributes.h" + +namespace eprosima{ +namespace fastrtps{ + +namespace rtps +{ +class RTPSParticipantListener; +} + + +using namespace rtps; + + + +class Participant; +class ParticipantImpl; +class Publisher; +class PublisherAttributes; +class PublisherListener; + +class Domain +{ + typedef std::pair t_p_Participant; +public: + Domain(); + virtual ~Domain(); + static Participant* createParticipant(RTPSParticipantAttributes& att,RTPSParticipantListener* listen = nullptr); + + static Publisher* createPublisher(Participant* part,PublisherAttributes& att, PublisherListener* listen = nullptr); + + static std::vector m_pubsubParticipants; + + +}; + +} /* namespace */ +} /* namespace eprosima */ + +#endif /* DOMAIN_H_ */ diff --git a/include/eprosimartps/pubsub/PUBSUBDomain_old.h b/include/fastrtps/PUBSUBDomain_old.h similarity index 98% rename from include/eprosimartps/pubsub/PUBSUBDomain_old.h rename to include/fastrtps/PUBSUBDomain_old.h index 70e2cd7d4af..34f5fe02a91 100644 --- a/include/eprosimartps/pubsub/PUBSUBDomain_old.h +++ b/include/fastrtps/PUBSUBDomain_old.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,8 +15,8 @@ #ifndef RTPSRTPSParticipant_H_ #define RTPSRTPSParticipant_H_ -#include "eprosimartps/rtps/common/Types.h" -#include "eprosimartps/rtps/attributes/RTPSParticipantAttributes.h" +#include "fastrtps/rtps/common/Types.h" +#include "fastrtps/rtps/attributes/RTPSParticipantAttributes.h" #include diff --git a/include/eprosimartps/pubsub/TopicDataType.h b/include/fastrtps/TopicDataType.h similarity index 84% rename from include/eprosimartps/pubsub/TopicDataType.h rename to include/fastrtps/TopicDataType.h index 9fb784f7783..9280337e59e 100644 --- a/include/eprosimartps/pubsub/TopicDataType.h +++ b/include/fastrtps/TopicDataType.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,26 +13,26 @@ #ifndef TOPICDATATYPE_H_ #define TOPICDATATYPE_H_ -#include "eprosimartps/rtps/common/Types.h" -#include "eprosimartps/rtps/common/SerializedPayload.h" -#include "eprosimartps/rtps/common/InstanceHandle.h" -#include "eprosimartps/utils/md5.h" -#include "eprosimartps/config/eprosima_stl_exports.hpp" +#include "fastrtps/rtps/common/Types.h" +#include "fastrtps/rtps/common/SerializedPayload.h" +#include "fastrtps/rtps/common/InstanceHandle.h" +#include "fastrtps/utils/md5.h" +#include "fastrtps/config/eprosima_stl_exports.hpp" #include -using namespace eprosima::rtps; +using namespace eprosima::fastrtps::rtps; namespace eprosima { -namespace pubsub { +namespace fastrtps { /** * Class TopicDataType used to provide the DomainRTPSParticipant with the methods to serialize, deserialize and get the key of a specific data type. * The user should created a class that inherits from this one, where Serialize and deserialize methods MUST be implemented. * @ingroup MODULE - * @snippet pubsub_example.cpp ex_TopicDataType + * @snippet fastrtps_example.cpp ex_TopicDataType */ class RTPS_DllAPI TopicDataType { public: diff --git a/include/eprosimartps/pubsub/attributes/PUBSUBParticipantAttributes.h b/include/fastrtps/attributes/ParticipantAttributes.h similarity index 54% rename from include/eprosimartps/pubsub/attributes/PUBSUBParticipantAttributes.h rename to include/fastrtps/attributes/ParticipantAttributes.h index 6a88461d8ca..ad420834ac0 100644 --- a/include/eprosimartps/pubsub/attributes/PUBSUBParticipantAttributes.h +++ b/include/fastrtps/attributes/ParticipantAttributes.h @@ -2,23 +2,23 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ /** - * @file PUBSUBParticipantAttributes.h + * @file ParticipantAttributes.h * */ -#ifndef PUBSUBPARTICIPANTATTRIBUTES_H_ -#define PUBSUBPARTICIPANTATTRIBUTES_H_ +#ifndef PARTICIPANTATTRIBUTES_H_ +#define PARTICIPANTATTRIBUTES_H_ namespace eprosima{ -namespace pubsub{ +namespace fastrtps{ -class PUBSUBParticipantAttributes +class ParticipantAttributes { }; @@ -28,4 +28,4 @@ class PUBSUBParticipantAttributes -#endif /* PUBSUBPARTICIPANTATTRIBUTES_H_ */ +#endif /* PARTICIPANTATTRIBUTES_H_ */ diff --git a/include/eprosimartps/pubsub/attributes/PublisherAttributes.h b/include/fastrtps/attributes/PublisherAttributes.h similarity index 78% rename from include/eprosimartps/pubsub/attributes/PublisherAttributes.h rename to include/fastrtps/attributes/PublisherAttributes.h index cf9b8d28d13..5719f48ce0f 100644 --- a/include/eprosimartps/pubsub/attributes/PublisherAttributes.h +++ b/include/fastrtps/attributes/PublisherAttributes.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,16 +15,17 @@ #include -#include "eprosimartps/rtps/common/Locator.h" -#include "eprosimartps/rtps/common/Time_t.h" -#include "eprosimartps/rtps/attributes/WriterAttributes.h" -#include "eprosimartps/pubsub/attributes/TopicAttributes.h" -#include "eprosimartps/pubsub/qos/PublisherQos.h" +#include "fastrtps/rtps/common/Locator.h" +#include "fastrtps/rtps/common/Time_t.h" +#include "fastrtps/rtps/attributes/WriterAttributes.h" +#include "fastrtps/attributes/TopicAttributes.h" +#include "fastrtps/qos/WriterQos.h" using namespace eprosima::rtps; namespace eprosima { -namespace pubsub { +namespace fastrtps{ + /** * Class PublisherAttributes, used by the user to define the attributes of a Publisher. @@ -55,7 +56,7 @@ class PublisherAttributes { int16_t m_entityID; }; -} /* namespace rtps */ +} } /* namespace eprosima */ #endif /* PUBLISHERPARAMETERS_H_ */ diff --git a/include/eprosimartps/pubsub/attributes/SubscriberAttributes.h b/include/fastrtps/attributes/SubscriberAttributes.h similarity index 85% rename from include/eprosimartps/pubsub/attributes/SubscriberAttributes.h rename to include/fastrtps/attributes/SubscriberAttributes.h index d6fafcfc96f..b1f302b4758 100644 --- a/include/eprosimartps/pubsub/attributes/SubscriberAttributes.h +++ b/include/fastrtps/attributes/SubscriberAttributes.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,14 +15,14 @@ -#include "eprosimartps/common/types/common_types.h" -#include "eprosimartps/common/types/Time_t.h" -#include "eprosimartps/common/types/Locator.h" -#include "eprosimartps/pubsub/attributes/TopicAttributes.h" -#include "eprosimartps/qos/ReaderQos.h" +#include "fastrtps/rtps/common/Types.h" +#include "fastrtps/rtps/common/Time_t.h" +#include "fastrtps/rtps/common/Locator.h" +#include "fastrtps/attributes/TopicAttributes.h" +#include "fastrtps/qos/ReaderQos.h" namespace eprosima { -namespace pubsub { +namespace fastrtps { class SubscriberTimes{ public: @@ -84,7 +84,7 @@ class SubscriberAttributes { int32_t entityId; }; -} /* namespace rtps */ +} /* namespace fastrtps */ } /* namespace eprosima */ #endif /* SUBSCRIBERPARAMS_H_ */ diff --git a/include/eprosimartps/pubsub/attributes/TopicAttributes.h b/include/fastrtps/attributes/TopicAttributes.h similarity index 92% rename from include/eprosimartps/pubsub/attributes/TopicAttributes.h rename to include/fastrtps/attributes/TopicAttributes.h index 86b56962432..8545bd5d67d 100644 --- a/include/eprosimartps/pubsub/attributes/TopicAttributes.h +++ b/include/fastrtps/attributes/TopicAttributes.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,15 +15,15 @@ #include -#include "eprosimartps/rtps/common/Types.h" +#include "fastrtps/rtps/common/Types.h" -#include "eprosimartps/pubsub/qos/QosPolicies.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/qos/QosPolicies.h" +#include "fastrtps/utils/RTPSLog.h" -using namespace eprosima::rtps; +using namespace eprosima::fastrtps::rtps; namespace eprosima { -namespace pubsub{ +namespace fastrtps{ /** * Class TopicAttributes, used by the user to define the attributes of the topic associated with a Publisher or Subscriber. diff --git a/include/eprosimartps/pubsub/attributes/all_attributes.h b/include/fastrtps/attributes/all_attributes.h similarity index 88% rename from include/eprosimartps/pubsub/attributes/all_attributes.h rename to include/fastrtps/attributes/all_attributes.h index 830b53b1363..7a5e73f81ae 100644 --- a/include/eprosimartps/pubsub/attributes/all_attributes.h +++ b/include/fastrtps/attributes/all_attributes.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/include/eprosimartps/config/doxygen_modules.h b/include/fastrtps/config/doxygen_modules.h similarity index 89% rename from include/eprosimartps/config/doxygen_modules.h rename to include/fastrtps/config/doxygen_modules.h index 2527abebbba..ee68e072630 100644 --- a/include/eprosimartps/config/doxygen_modules.h +++ b/include/fastrtps/config/doxygen_modules.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -16,7 +16,7 @@ //Description of doxygen modules, not used in actual code. /*! - * @defgroup EPROSIMARTPSAPIREFERENCE eProsima RTPS API Reference + * @defgroup fastrtpsAPIREFERENCE eProsima RTPS API Reference * @brief eProsima RTPS API grouped in modules. */ @@ -24,7 +24,7 @@ /*! * @defgroup RTPSMODULE RTPS - * @ingroup EPROSIMARTPSAPIREFERENCE + * @ingroup fastrtpsAPIREFERENCE * @brief RTPS API * This is an implementation of the RTPS communication standard defined by the OMG. * The PUBLISHER_SUBSCRIBER - Public API provided is provided to the users to create applications and to manage them. @@ -32,14 +32,14 @@ #endif /*! - * @defgroup PUBSUBMODULE Public API - * @ingroup EPROSIMARTPSAPIREFERENCE + * @defgroup FASTRTPSMODULE Public API + * @ingroup fastrtpsAPIREFERENCE * @brief PUBLISHER_SUBSCRIBER Public API * This Module contains the Public API for this library. */ /** @defgroup ATTRIBUTESMODULE Attributes Module. - * @ingroup PUBSUBMODULE + * @ingroup FASTRTPSMODULE * @brief Attributes class used to define the public entities that the user should use to control this library. */ @@ -87,7 +87,7 @@ #endif /** @defgroup UTILITIESMODULE Shared Utilities - * @ingroup EPROSIMARTPSAPIREFERENCE + * @ingroup fastrtpsAPIREFERENCE * Shared utilities that can be used by one or more classes in different modules. They are not strictly part of the RTPS implementation * but very useful to implement different functionalities. */ diff --git a/include/eprosimartps/config/eProsima_auto_link.h b/include/fastrtps/config/eProsima_auto_link.h similarity index 100% rename from include/eprosimartps/config/eProsima_auto_link.h rename to include/fastrtps/config/eProsima_auto_link.h diff --git a/include/eprosimartps/config/eprosima_stl_exports.hpp b/include/fastrtps/config/eprosima_stl_exports.hpp similarity index 96% rename from include/eprosimartps/config/eprosima_stl_exports.hpp rename to include/fastrtps/config/eprosima_stl_exports.hpp index ab630d2a361..c91855919d5 100644 --- a/include/eprosimartps/config/eprosima_stl_exports.hpp +++ b/include/fastrtps/config/eprosima_stl_exports.hpp @@ -1,5 +1,5 @@ -#include "eprosimartps_dll.h" -#include "eprosimartps/rtps/common/Types.h" +#include "fastrtps_dll.h" +#include "fastrtps/rtps/common/Types.h" #include #include diff --git a/include/fastrtps/config/fastrtps_dll.h b/include/fastrtps/config/fastrtps_dll.h new file mode 100644 index 00000000000..56240a867e8 --- /dev/null +++ b/include/fastrtps/config/fastrtps_dll.h @@ -0,0 +1,63 @@ +/************************************************************************* + * Copyright (c) 201 4 eProsima. All rights reserved. + * + * This copy of fastrtps is licensed to you under the terms described in the + * fastrtps_LIBRARY_LICENSE file included in this distribution. + * + *************************************************************************/ + +#ifndef _fastrtps_fastrtps_DLL_H_ +#define _fastrtps_fastrtps_DLL_H_ + +// normalize macros +#if !defined(fastrtps_DYN_LINK) && !defined(fastrtps_STATIC_LINK) \ + && !defined(EPROSIMA_ALL_DYN_LINK) && !defined(EPROSIMA_ALL_STATIC_LINK) +#define fastrtps_STATIC_LINK +#endif + +#if defined(EPROSIMA_ALL_DYN_LINK) && !defined(fastrtps_DYN_LINK) +#define fastrtps_DYN_LINK +#endif + +#if defined(fastrtps_DYN_LINK) && defined(fastrtps_STATIC_LINK) +#error Must not define both fastrtps_DYN_LINK and fastrtps_STATIC_LINK +#endif + +#if defined(EPROSIMA_ALL_NO_LIB) && !defined(fastrtps_NO_LIB) +#define fastrtps_NO_LIB +#endif + +// enable dynamic linking + +#if defined(_WIN32) +#if defined(EPROSIMA_ALL_DYN_LINK) || defined(fastrtps_DYN_LINK) +#if defined(fastrtps_SOURCE) +#define RTPS_DllAPI __declspec( dllexport ) +#else +#define RTPS_DllAPI __declspec( dllimport ) +#endif // fastrtps_SOURCE +#else +#define RTPS_DllAPI +#endif +#else +#define RTPS_DllAPI +#endif // _WIN32 + +// Auto linking. + +#if !defined(fastrtps_SOURCE) && !defined(EPROSIMA_ALL_NO_LIB) \ + && !defined(fastrtps_NO_LIB) + +#include "fastrtps/fastrtps_version.h" + +// Set properties. +#define EPROSIMA_LIB_NAME fastrtps + +#if defined(EPROSIMA_ALL_DYN_LINK) || defined(fastrtps_DYN_LINK) +#define EPROSIMA_DYN_LINK +#endif + +#include "fastrtps/config/eProsima_auto_link.h" +#endif // auto-linking disabled + +#endif // _fastrtps_fastrtps_DLL_H_ diff --git a/include/fastrtps/fastrtps_all.h b/include/fastrtps/fastrtps_all.h new file mode 100644 index 00000000000..2b1c048dbe5 --- /dev/null +++ b/include/fastrtps/fastrtps_all.h @@ -0,0 +1,46 @@ +/************************************************************************* + * Copyright (c) 2014 eProsima. All rights reserved. + * + * This copy of eProsima RTPS is licensed to you under the terms described in the + * fastrtps_LIBRARY_LICENSE file included in this distribution. + * + *************************************************************************/ + +/** + * @file rtps_all.h + * + */ + +#ifndef RTPS_ALL_H_ +#define RTPS_ALL_H_ + +//USE THIS HEADER WITH CAUTION. +//IT INCLUDES ALL NECESSARY ELEMENTS TO COMPILE A TESTS USING THE PUBLIC API. + +#include "fastrtps/common/types/all_common.h" + +#include "fastrtps/pubsub/attributes/all_attributes.h" +#include "fastrtps/RTPSParticipant.h" +#include "fastrtps/pubsub/TopicDataType.h" +#include "fastrtps/pubsub/RTPSDomain.h" +#include "fastrtps/pubsub/Publisher.h" +#include "fastrtps/pubsub/Subscriber.h" +#include "fastrtps/pubsub/PublisherListener.h" +#include "fastrtps/pubsub/SubscriberListener.h" +#include "fastrtps/pubsub/RTPSParticipantListener.h" + +#include "fastrtps/pubsub/SampleInfo.h" + +#include "fastrtps/utils/IPFinder.h" +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/utils/eClock.h" +#include "fastrtps/utils/TimeConversion.h" + +#include "fastrtps/qos/ParameterList.h" +#include "fastrtps/qos/QosPolicies.h" + +using namespace eprosima; +using namespace pubsub; +using namespace rtps; + +#endif /* RTPS_ALL_H_ */ diff --git a/include/eprosimartps/eprosimartps_version.h b/include/fastrtps/fastrtps_version.h similarity index 100% rename from include/eprosimartps/eprosimartps_version.h rename to include/fastrtps/fastrtps_version.h diff --git a/include/fastrtps/participant/Participant.h b/include/fastrtps/participant/Participant.h new file mode 100644 index 00000000000..f64dd57be3c --- /dev/null +++ b/include/fastrtps/participant/Participant.h @@ -0,0 +1,49 @@ +/************************************************************************* + * Copyright (c) 2014 eProsima. All rights reserved. + * + * This copy of eProsima RTPS is licensed to you under the terms described in the + * fastrtps_LIBRARY_LICENSE file included in this distribution. + * + *************************************************************************/ + +/** + * @file Participant.h + * + */ + +#ifndef PARTICIPANT_H_ +#define PARTICIPANT_H_ + +#include "fastrtps/rtps/common/Guid.h" + +#include "fastrtps/rtps/attributes/RTPSParticipantAttributes.h" + +using namespace eprosima::fastrtps::rtps; + +namespace eprosima { +namespace fastrtps{ + + +class ParticipantImpl; + + +class Participant { + friend class Domain; + friend class ParticipantImpl; +private: + Participant(); + virtual ~Participant(); + + + ParticipantImpl* mp_impl; + +public: + + const GUID_t& getGuid()const ; + +}; + +} +} /* namespace eprosima */ + +#endif /* PARTICIPANT_H_ */ diff --git a/include/eprosimartps/pubsub/participant/PUBSUBParticipantImpl.h b/include/fastrtps/participant/ParticipantImpl.h similarity index 60% rename from include/eprosimartps/pubsub/participant/PUBSUBParticipantImpl.h rename to include/fastrtps/participant/ParticipantImpl.h index 9eaba78ab24..a7feffea0ce 100644 --- a/include/eprosimartps/pubsub/participant/PUBSUBParticipantImpl.h +++ b/include/fastrtps/participant/ParticipantImpl.h @@ -2,48 +2,49 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ /** - * @file PUBSUBParticipantImpl.h + * @file ParticipantImpl.h * */ -#ifndef PUBSUBPARTICIPANTIMPL_H_ -#define PUBSUBPARTICIPANTIMPL_H_ +#ifndef PARTICIPANTIMPL_H_ +#define PARTICIPANTIMPL_H_ -#include "eprosimartps/rtps/common/Guid.h" +#include "fastrtps/rtps/common/Guid.h" -#include "eprosimartps/rtps/attributes/RTPSParticipantAttributes.h" +#include "fastrtps/attributes/ParticipantAttributes.h" -namespace eprosima -{ +namespace eprosima{ +namespace fastrtps{ namespace rtps{ class RTPSParticipant; } } +} -using namespace eprosima::rtps; +using namespace eprosima::fastrtps::rtps; namespace eprosima { -namespace pubsub { +namespace fastrtps { class TopicDataType; class Publisher; class PublisherImpl; class PublisherAttributes; class PublisherListener; -class PUBSUBParticipant; +class Participant; -class PUBSUBParticipantImpl { - friend class PUBSUBDomain; +class ParticipantImpl { + friend class Domain; typedef std::pair t_p_PublisherPair; typedef std::vector t_v_PublisherPairs; private: - PUBSUBParticipantImpl(RTPSParticipantAttributes& patt,PUBSUBParticipant* pspart,RTPSParticipant* part); - virtual ~PUBSUBParticipantImpl(); + ParticipantImpl(ParticipantAttributes& patt,Participant* pspart,RTPSParticipant* part); + virtual ~ParticipantImpl(); public: @@ -55,11 +56,11 @@ class PUBSUBParticipantImpl { private: //!Participant Attributes - RTPSParticipantAttributes m_att; + ParticipantAttributes m_att; //!RTPSParticipant RTPSParticipant* mp_rtpsParticipant; - //!PUBSUBParticipant* - PUBSUBParticipant* mp_pubsubParticipant; + //!Participant* + Participant* mp_Participant; //!Publisher Vector t_v_PublisherPairs m_publishers; //!TOpicDatType vector @@ -69,7 +70,7 @@ class PUBSUBParticipantImpl { }; -} /* namespace pubsub */ +} /* namespace */ } /* namespace eprosima */ -#endif /* PUBSUBPARTICIPANTIMPL_H_ */ +#endif /* PARTICIPANTIMPL_H_ */ diff --git a/include/eprosimartps/pubsub/publisher/Publisher.h b/include/fastrtps/publisher/Publisher.h similarity index 88% rename from include/eprosimartps/pubsub/publisher/Publisher.h rename to include/fastrtps/publisher/Publisher.h index 7d8f57de5ac..8a9061c7be3 100644 --- a/include/eprosimartps/pubsub/publisher/Publisher.h +++ b/include/fastrtps/publisher/Publisher.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,7 +15,7 @@ #define PUBLISHER_H_ namespace eprosima { -namespace pubsub { +namespace fastrtps { class PublisherImpl; @@ -28,7 +28,7 @@ class Publisher { * @param Data Pointer to the data * @return True if correct * @par Calling example: - * @snippet pubsub_example.cpp ex_PublisherWrite + * @snippet fastrtps_example.cpp ex_PublisherWrite */ bool write(void*Data); @@ -55,7 +55,7 @@ class Publisher { PublisherImpl* mp_impl; }; -} /* namespace pubsub */ +} /* namespace fastrtps */ } /* namespace eprosima */ #endif /* PUBLISHER_H_ */ diff --git a/include/eprosimartps/pubsub/publisher/PublisherHistory.h b/include/fastrtps/publisher/PublisherHistory.h similarity index 83% rename from include/eprosimartps/pubsub/publisher/PublisherHistory.h rename to include/fastrtps/publisher/PublisherHistory.h index 34d06e70a60..5fc3c482da2 100644 --- a/include/eprosimartps/pubsub/publisher/PublisherHistory.h +++ b/include/fastrtps/publisher/PublisherHistory.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,13 +14,13 @@ #ifndef PUBLISHERHISTORY_H_ #define PUBLISHERHISTORY_H_ -#include "eprosimartps/rtps/history/WriterHistory.h" -#include "eprosimartps/pubsub/qos/QosPolicies.h" +#include "fastrtps/rtps/history/WriterHistory.h" +#include "fastrtps/qos/QosPolicies.h" -using namespace eprosima::rtps; +using namespace eprosima::fastrtps::rtps; namespace eprosima { -namespace pubsub { +namespace fastrtps { class PublisherImpl; @@ -45,7 +45,7 @@ class PublisherHistory:public WriterHistory bool find_Key(CacheChange_t* a_change,t_v_Inst_Caches::iterator* vecPairIterrator); }; -} /* namespace pubsub */ +} /* namespace fastrtps */ } /* namespace eprosima */ #endif /* PUBLISHERHISTORY_H_ */ diff --git a/include/eprosimartps/pubsub/publisher/PublisherImpl.h b/include/fastrtps/publisher/PublisherImpl.h similarity index 87% rename from include/eprosimartps/pubsub/publisher/PublisherImpl.h rename to include/fastrtps/publisher/PublisherImpl.h index 20310c1d9e9..ccc683e5770 100644 --- a/include/eprosimartps/pubsub/publisher/PublisherImpl.h +++ b/include/fastrtps/publisher/PublisherImpl.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -16,16 +16,16 @@ #define PUBLISHERIMPL_H_ #include -#include "eprosimartps/rtps/common/Locator.h" -#include "eprosimartps/rtps/common/Guid.h" +#include "fastrtps/rtps/common/Locator.h" +#include "fastrtps/rtps/common/Guid.h" -#include "eprosimartps/pubsub/attributes/PublisherAttributes.h" +#include "fastrtps/attributes/PublisherAttributes.h" -#include "eprosimartps/pubsub/publisher/PublisherHistory.h" +#include "fastrtps/publisher/PublisherHistory.h" -#include "eprosimartps/rtps/writer/WriterListener.h" +#include "fastrtps/rtps/writer/WriterListener.h" namespace eprosima { - +namespace fastrtps{ namespace rtps { class RTPSWriter; @@ -33,28 +33,28 @@ class RTPSWriter; using namespace rtps; /** - * PUBSUB namespace. Contains the public API to interact with the RTPS protocol. - * @ingroup PUBSUBMODULE + * FASTRTPS namespace. Contains the public API to interact with the RTPS protocol. + * @ingroup FASTRTPSMODULE */ -namespace pubsub { + class TopicDataType; class PublisherListener; -class PUBSUBParticipantImpl; +class ParticipantImpl; /** * Class PublisherImpl, contains the actual implementation of the behaviour of the Publisher. */ class PublisherImpl { - friend class PUBSUBParticipantImpl; + friend class ParticipantImpl; public: /** * Create a publisher, assigning its pointer to the associated writer. * Don't use directly, create Publisher using DomainRTPSParticipant static function. */ - PublisherImpl(PUBSUBParticipantImpl* p,TopicDataType* ptype, + PublisherImpl(ParticipantImpl* p,TopicDataType* ptype, PublisherAttributes& att,PublisherListener* p_listen = nullptr); virtual ~PublisherImpl(); @@ -97,7 +97,7 @@ class PublisherImpl { PublisherAttributes& getAttributes(); private: - PUBSUBParticipantImpl* mp_participant; + ParticipantImpl* mp_participant; //! Pointer to the associated Data Writer. RTPSWriter* mp_writer; //! Pointer to the TopicDataType object. @@ -124,8 +124,8 @@ class PublisherImpl { ///** // * Class Publisher, contains the public API to send new data. This class should not be instantiated directly. // * DomainRTPSParticipant class should be used to correctly initialize this element. -// * @ingroup PUBSUBMODULE -// * @snippet pubsub_example.cpp ex_Publisher +// * @ingroup MODULE +// * @snippet _example.cpp ex_Publisher // */ //class RTPS_DllAPI Publisher{ //public: @@ -235,7 +235,7 @@ class PublisherImpl { //}; -} /* namespace pubsub */ +} /* namespace */ } /* namespace eprosima */ #endif /* PUBLISHER_H_ */ diff --git a/include/eprosimartps/pubsub/publisher/PublisherListener.h b/include/fastrtps/publisher/PublisherListener.h similarity index 76% rename from include/eprosimartps/pubsub/publisher/PublisherListener.h rename to include/fastrtps/publisher/PublisherListener.h index 2ee3094a0dc..2893a099570 100644 --- a/include/eprosimartps/pubsub/publisher/PublisherListener.h +++ b/include/fastrtps/publisher/PublisherListener.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,16 +13,18 @@ #ifndef PUBLISHERLISTENER_H_ #define PUBLISHERLISTENER_H_ -#include "eprosimartps/rtps/common/Types.h" -#include "eprosimartps/rtps/common/MatchingInfo.h" +#include "fastrtps/rtps/common/Types.h" +#include "fastrtps/rtps/common/MatchingInfo.h" + +using namespace eprosima::fastrtps::rtps; namespace eprosima { -namespace pubsub { +namespace fastrtps { /** * Class PublisherListener, it should be used by the end user to implement specific callbacks to certain actions. - * @ingroup PUBSUBMODULE - * @snippet pubsub_example.cpp ex_PublisherListener + * @ingroup FASTRTPSMODULE + * @snippet fastrtps_example.cpp ex_PublisherListener */ class RTPS_DllAPI PublisherListener { diff --git a/include/eprosimartps/pubsub/qos/ParameterList.h b/include/fastrtps/qos/ParameterList.h similarity index 86% rename from include/eprosimartps/pubsub/qos/ParameterList.h rename to include/fastrtps/qos/ParameterList.h index dbff59a82ff..b725e4729ca 100644 --- a/include/eprosimartps/pubsub/qos/ParameterList.h +++ b/include/fastrtps/qos/ParameterList.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,14 +13,14 @@ #ifndef PARAM_LIST_T_H_ #define PARAM_LIST_T_H_ -#include "eprosimartps/pubsub/qos/ParameterTypes.h" -#include "eprosimartps/rtps/messages/RTPS_messages.h" -#include "eprosimartps/rtps/common/CDRMessage_t.h" -#include "eprosimartps/rtps/messages/CDRMessage.h" -#include "eprosimartps/rtps/common/CacheChange.h" +#include "fastrtps/qos/ParameterTypes.h" +#include "fastrtps/rtps/messages/RTPS_messages.h" +#include "fastrtps/rtps/common/CDRMessage_t.h" +#include "fastrtps/rtps/messages/CDRMessage.h" +#include "fastrtps/rtps/common/CacheChange.h" namespace eprosima { -namespace pubsub { +namespace fastrtps { /** * ParameterList_t class, used to store multiple parameters as a vector of pointers to the base class. @@ -85,7 +85,7 @@ class ParameterList -} /* namespace pubsub */ +} /* namespace */ } /* namespace eprosima */ #endif /* PARAMLISTT_H_ */ diff --git a/include/eprosimartps/pubsub/qos/ParameterTypes.h b/include/fastrtps/qos/ParameterTypes.h similarity index 97% rename from include/eprosimartps/pubsub/qos/ParameterTypes.h rename to include/fastrtps/qos/ParameterTypes.h index 8bbb0788802..4737508aa63 100644 --- a/include/eprosimartps/pubsub/qos/ParameterTypes.h +++ b/include/fastrtps/qos/ParameterTypes.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,8 +13,8 @@ #ifndef PARAMETERTYPES_H_ #define PARAMETERTYPES_H_ -#include "eprosimartps/rtps/common/all_common.h" -#include "eprosimartps/config/eprosima_stl_exports.hpp" +#include "fastrtps/rtps/common/all_common.h" +#include "fastrtps/config/eprosima_stl_exports.hpp" #include #include @@ -23,14 +23,14 @@ using namespace eprosima::rtps; namespace eprosima { +namespace fastrtps { namespace rtps{ struct CDRMessage_t; } -namespace pubsub { - +using namespace rtps; @@ -286,7 +286,7 @@ class RTPS_DllAPI ParameterPropertyList_t:public Parameter_t{ #endif -} //end of namespace pubsub +} //end of namespace } //end of namespace eprosima diff --git a/include/eprosimartps/pubsub/qos/QosList.h b/include/fastrtps/qos/QosList.h similarity index 92% rename from include/eprosimartps/pubsub/qos/QosList.h rename to include/fastrtps/qos/QosList.h index e201f984930..9e1f9014316 100644 --- a/include/eprosimartps/pubsub/qos/QosList.h +++ b/include/fastrtps/qos/QosList.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,12 +13,12 @@ #ifndef QOSLIST_H_ #define QOSLIST_H_ -#include "eprosimartps/common/types/all_common.h" -#include "eprosimartps/qos/ParameterList.h" +#include "fastrtps/rtps/common/all_common.h" +#include "fastrtps/qos/ParameterList.h" namespace eprosima { -namespace pubsub { +namespace fastrtps { /** * QosList_t class contains two ParameterList_t for the Qos. diff --git a/include/eprosimartps/pubsub/qos/QosPolicies.h b/include/fastrtps/qos/QosPolicies.h similarity index 96% rename from include/eprosimartps/pubsub/qos/QosPolicies.h rename to include/fastrtps/qos/QosPolicies.h index f1cfc2a9e50..69fcd0d2b37 100644 --- a/include/eprosimartps/pubsub/qos/QosPolicies.h +++ b/include/fastrtps/qos/QosPolicies.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,15 +15,15 @@ #define QOS_POLICIES_H_ #include -#include "eprosimartps/rtps/common/Types.h" -#include "eprosimartps/rtps/common/Time_t.h" -#include "eprosimartps/pubsub/qos/ParameterTypes.h" -#include "eprosimartps/config/eprosima_stl_exports.hpp" -using namespace eprosima::rtps; +#include "fastrtps/rtps/common/Types.h" +#include "fastrtps/rtps/common/Time_t.h" +#include "fastrtps/qos/ParameterTypes.h" +#include "fastrtps/config/eprosima_stl_exports.hpp" +using namespace eprosima::fastrtps::rtps; namespace eprosima{ -namespace pubsub{ +namespace fastrtps{ /** * QosPolicy is a base class for all the different QoS defined to the Writers and Readers. diff --git a/include/eprosimartps/pubsub/qos/ReaderQos.h b/include/fastrtps/qos/ReaderQos.h similarity index 94% rename from include/eprosimartps/pubsub/qos/ReaderQos.h rename to include/fastrtps/qos/ReaderQos.h index afcefa59215..96ffb4e7c55 100644 --- a/include/eprosimartps/pubsub/qos/ReaderQos.h +++ b/include/fastrtps/qos/ReaderQos.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,9 +13,9 @@ #ifndef READERQOS_H_ #define READERQOS_H_ -#include "eprosimartps/qos/QosPolicies.h" +#include "fastrtps/qos/QosPolicies.h" namespace eprosima { -namespace pubsub { +namespace fastrtps { /** * ReaderQos class contains all the possible Qos that can be set for a determined Subscriber. Although these values can be set and are transmitted @@ -77,7 +77,7 @@ class ReaderQos{ -} /* namespace pubsub */ +} /* namespace */ } /* namespace eprosima */ #endif /* READERQOS_H_ */ diff --git a/include/eprosimartps/pubsub/qos/WriterQos.h b/include/fastrtps/qos/WriterQos.h similarity index 94% rename from include/eprosimartps/pubsub/qos/WriterQos.h rename to include/fastrtps/qos/WriterQos.h index 1aef044a1f7..9bded4a07d8 100644 --- a/include/eprosimartps/pubsub/qos/WriterQos.h +++ b/include/fastrtps/qos/WriterQos.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,10 +14,10 @@ #ifndef WRITERQOS_H_ #define WRITERQOS_H_ -#include "eprosimartps/pubsub/qos/QosPolicies.h" +#include "fastrtps/qos/QosPolicies.h" namespace eprosima { -namespace pubsub { +namespace fastrtps { /** @@ -78,7 +78,7 @@ class RTPS_DllAPI WriterQos{ -} /* namespace pubsub */ +} /* namespace */ } /* namespace eprosima */ #endif /* WRITERQOS_H_ */ diff --git a/include/eprosimartps/rtps/Endpoint.h b/include/fastrtps/rtps/Endpoint.h similarity index 86% rename from include/eprosimartps/rtps/Endpoint.h rename to include/fastrtps/rtps/Endpoint.h index 6f69b2381a3..359c9e2fbff 100644 --- a/include/eprosimartps/rtps/Endpoint.h +++ b/include/fastrtps/rtps/Endpoint.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,11 +14,11 @@ #ifndef ENDPOINT_H_ #define ENDPOINT_H_ -#include "eprosimartps/rtps/common/Types.h" -#include "eprosimartps/rtps/common/Locator.h" -#include "eprosimartps/rtps/common/Guid.h" +#include "fastrtps/rtps/common/Types.h" +#include "fastrtps/rtps/common/Locator.h" +#include "fastrtps/rtps/common/Guid.h" -#include "eprosimartps/rtps/attributes/EndpointAttributes.h" +#include "fastrtps/rtps/attributes/EndpointAttributes.h" namespace boost { @@ -26,6 +26,7 @@ namespace boost } namespace eprosima { +namespace fastrtps{ namespace rtps { class RTPSParticipantImpl; @@ -68,7 +69,7 @@ class Endpoint }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/RTPSDomain.h b/include/fastrtps/rtps/RTPSDomain.h similarity index 91% rename from include/eprosimartps/rtps/RTPSDomain.h rename to include/fastrtps/rtps/RTPSDomain.h index 1c38eb854aa..bdbda4b769e 100644 --- a/include/eprosimartps/rtps/RTPSDomain.h +++ b/include/fastrtps/rtps/RTPSDomain.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,15 +15,15 @@ #ifndef RTPSRTPSParticipant_H_ #define RTPSRTPSParticipant_H_ -#include "eprosimartps/rtps/common/Types.h" +#include "fastrtps/rtps/common/Types.h" -#include "eprosimartps/rtps/attributes/RTPSParticipantAttributes.h" +#include "fastrtps/rtps/attributes/RTPSParticipantAttributes.h" #include namespace eprosima{ - +namespace fastrtps{ namespace rtps{ class RTPSParticipantImpl; @@ -63,7 +63,7 @@ class RTPSDomain /** * @brief Create a RTPSParticipant. - * @snippet pubsub_example.cpp ex_RTPSParticipantCreation + * @snippet fastrtps_example.cpp ex_RTPSParticipantCreation * @param PParam RTPSParticipant Parameters. * @return Pointer to the RTPSParticipant. */ @@ -128,8 +128,8 @@ class RTPSDomain - -} /* namespace pubsub */ +} +} /* namespace */ } /* namespace eprosima */ #endif /* DOMAINRTPSParticipant_H_ */ diff --git a/include/eprosimartps/rtps/attributes/EndpointAttributes.h b/include/fastrtps/rtps/attributes/EndpointAttributes.h similarity index 90% rename from include/eprosimartps/rtps/attributes/EndpointAttributes.h rename to include/fastrtps/rtps/attributes/EndpointAttributes.h index ec32d56980e..70532a6223a 100644 --- a/include/eprosimartps/rtps/attributes/EndpointAttributes.h +++ b/include/fastrtps/rtps/attributes/EndpointAttributes.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,9 +13,10 @@ #ifndef ENDPOINTATTRIBUTES_H_ #define ENDPOINTATTRIBUTES_H_ -#include "eprosimartps/rtps/common/Types.h" +#include "fastrtps/rtps/common/Types.h" namespace eprosima { +namespace fastrtps{ namespace rtps { class EndpointAttributes @@ -45,7 +46,7 @@ class EndpointAttributes int16_t m_userDefinedID; int16_t m_entityID; }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/attributes/HistoryAttributes.h b/include/fastrtps/rtps/attributes/HistoryAttributes.h similarity index 90% rename from include/eprosimartps/rtps/attributes/HistoryAttributes.h rename to include/fastrtps/rtps/attributes/HistoryAttributes.h index 9c467100c7f..1e583066f35 100644 --- a/include/eprosimartps/rtps/attributes/HistoryAttributes.h +++ b/include/fastrtps/rtps/attributes/HistoryAttributes.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,6 +15,7 @@ #define HISTORYATTRIBUTES_H_ namespace eprosima{ +namespace fastrtps{ namespace rtps{ @@ -31,7 +32,7 @@ class HistoryAttributes int32_t maximumReservedCaches; }; - +} } } diff --git a/include/eprosimartps/rtps/attributes/RTPSParticipantAttributes.h b/include/fastrtps/rtps/attributes/RTPSParticipantAttributes.h similarity index 96% rename from include/eprosimartps/rtps/attributes/RTPSParticipantAttributes.h rename to include/fastrtps/rtps/attributes/RTPSParticipantAttributes.h index 3c343af89af..d15b1391708 100644 --- a/include/eprosimartps/rtps/attributes/RTPSParticipantAttributes.h +++ b/include/fastrtps/rtps/attributes/RTPSParticipantAttributes.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,10 +13,11 @@ #ifndef RTPSParticipantPARAMETERS_H_ #define RTPSParticipantPARAMETERS_H_ -#include "eprosimartps/rtps/common/Time_t.h" -#include "eprosimartps/rtps/common/Locator.h" +#include "fastrtps/rtps/common/Time_t.h" +#include "fastrtps/rtps/common/Locator.h" namespace eprosima { +namespace fastrtps{ namespace rtps { class SimpleEDPAttributes{ @@ -181,7 +182,7 @@ class RTPSParticipantAttributes { }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/attributes/ReaderAttributes.h b/include/fastrtps/rtps/attributes/ReaderAttributes.h similarity index 86% rename from include/eprosimartps/rtps/attributes/ReaderAttributes.h rename to include/fastrtps/rtps/attributes/ReaderAttributes.h index a5f18b3c46b..15e1ffeb29d 100644 --- a/include/eprosimartps/rtps/attributes/ReaderAttributes.h +++ b/include/fastrtps/rtps/attributes/ReaderAttributes.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,9 +14,10 @@ #ifndef READERATTRIBUTES_H_ #define READERATTRIBUTES_H_ -#include "eprosimartps/rtps/common/Time_t.h" -#include "eprosimartps/rtps/attributes/EndpointAttributes.h" +#include "fastrtps/rtps/common/Time_t.h" +#include "fastrtps/rtps/attributes/EndpointAttributes.h" namespace eprosima{ +namespace fastrtps{ namespace rtps{ @@ -61,7 +62,7 @@ class RemoteWriterAttributes EndpointAttributes endpoint; GUID_t guid; }; - +} } } diff --git a/include/eprosimartps/rtps/attributes/WriterAttributes.h b/include/fastrtps/rtps/attributes/WriterAttributes.h similarity index 86% rename from include/eprosimartps/rtps/attributes/WriterAttributes.h rename to include/fastrtps/rtps/attributes/WriterAttributes.h index 3c85be22473..993eb8c4217 100644 --- a/include/eprosimartps/rtps/attributes/WriterAttributes.h +++ b/include/fastrtps/rtps/attributes/WriterAttributes.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,9 +14,10 @@ #ifndef WRITERATTRIBUTES_H_ #define WRITERATTRIBUTES_H_ -#include "eprosimartps/rtps/common/Time_t.h" -#include "eprosimartps/rtps/attributes/EndpointAttributes.h" +#include "fastrtps/rtps/common/Time_t.h" +#include "fastrtps/rtps/attributes/EndpointAttributes.h" namespace eprosima{ +namespace fastrtps{ namespace rtps{ @@ -64,7 +65,7 @@ class RemoteReaderAttributes GUID_t guid; bool expectsInlineQos; }; - +} } } diff --git a/include/eprosimartps/rtps/builtin/BuiltinProtocols.h b/include/fastrtps/rtps/builtin/BuiltinProtocols.h similarity index 95% rename from include/eprosimartps/rtps/builtin/BuiltinProtocols.h rename to include/fastrtps/rtps/builtin/BuiltinProtocols.h index 16e4c91c899..2c4bbb58eff 100644 --- a/include/eprosimartps/rtps/builtin/BuiltinProtocols.h +++ b/include/fastrtps/rtps/builtin/BuiltinProtocols.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef BUILTINPROTOCOLS_H_ #define BUILTINPROTOCOLS_H_ -#include "eprosimartps/rtps/attributes/RTPSParticipantAttributes.h" +#include "fastrtps/rtps/attributes/RTPSParticipantAttributes.h" namespace eprosima { diff --git a/include/eprosimartps/rtps/builtin/ParticipantProxyData.h b/include/fastrtps/rtps/builtin/ParticipantProxyData.h similarity index 93% rename from include/eprosimartps/rtps/builtin/ParticipantProxyData.h rename to include/fastrtps/rtps/builtin/ParticipantProxyData.h index e36a61895fb..3c9e3c399bd 100644 --- a/include/eprosimartps/rtps/builtin/ParticipantProxyData.h +++ b/include/fastrtps/rtps/builtin/ParticipantProxyData.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,11 +14,11 @@ #ifndef RTPSParticipantPROXYDATA_H_ #define RTPSParticipantPROXYDATA_H_ -#include "eprosimartps/qos/QosList.h" -#include "eprosimartps/qos/ParameterList.h" +#include "fastrtps/qos/QosList.h" +#include "fastrtps/qos/ParameterList.h" -#include "eprosimartps/reader/WriterProxyData.h" -#include "eprosimartps/writer/ReaderProxyData.h" +#include "fastrtps/reader/WriterProxyData.h" +#include "fastrtps/writer/ReaderProxyData.h" diff --git a/include/eprosimartps/rtps/builtin/ReaderProxyData.h b/include/fastrtps/rtps/builtin/ReaderProxyData.h similarity index 90% rename from include/eprosimartps/rtps/builtin/ReaderProxyData.h rename to include/fastrtps/rtps/builtin/ReaderProxyData.h index 4c349d67460..1d91fbf1b04 100644 --- a/include/eprosimartps/rtps/builtin/ReaderProxyData.h +++ b/include/fastrtps/rtps/builtin/ReaderProxyData.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,9 +13,9 @@ #ifndef READERPROXYDATA_H_ #define READERPROXYDATA_H_ -#include "eprosimartps/pubsub/attributes/TopicAttributes.h" -#include "eprosimartps/qos/ParameterList.h" -#include "eprosimartps/qos/ReaderQos.h" +#include "fastrtps/pubsub/attributes/TopicAttributes.h" +#include "fastrtps/qos/ParameterList.h" +#include "fastrtps/qos/ReaderQos.h" using namespace eprosima::pubsub; diff --git a/include/eprosimartps/rtps/builtin/discovery/endpoint/EDP.h b/include/fastrtps/rtps/builtin/discovery/endpoint/EDP.h similarity index 96% rename from include/eprosimartps/rtps/builtin/discovery/endpoint/EDP.h rename to include/fastrtps/rtps/builtin/discovery/endpoint/EDP.h index 6b284bc6496..7d0f338cd15 100644 --- a/include/eprosimartps/rtps/builtin/discovery/endpoint/EDP.h +++ b/include/fastrtps/rtps/builtin/discovery/endpoint/EDP.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,8 +14,8 @@ #ifndef EDP_H_ #define EDP_H_ -#include "eprosimartps/pubsub/attributes/RTPSParticipantAttributes.h" -#include "eprosimartps/common/types/Guid.h" +#include "fastrtps/pubsub/attributes/RTPSParticipantAttributes.h" +#include "fastrtps/common/types/Guid.h" namespace eprosima { namespace rtps { diff --git a/include/eprosimartps/rtps/builtin/discovery/endpoint/EDPSimple.h b/include/fastrtps/rtps/builtin/discovery/endpoint/EDPSimple.h similarity index 92% rename from include/eprosimartps/rtps/builtin/discovery/endpoint/EDPSimple.h rename to include/fastrtps/rtps/builtin/discovery/endpoint/EDPSimple.h index d090b2b4fa3..dc529d6e9c6 100644 --- a/include/eprosimartps/rtps/builtin/discovery/endpoint/EDPSimple.h +++ b/include/fastrtps/rtps/builtin/discovery/endpoint/EDPSimple.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,9 +14,9 @@ #ifndef EDPSIMPLE_H_ #define EDPSIMPLE_H_ -#include "eprosimartps/builtin/discovery/endpoint/EDP.h" -#include "eprosimartps/builtin/discovery/endpoint/EDPSimpleListeners.h" -#include "eprosimartps/builtin/discovery/endpoint/EDPSimpleTopicDataType.h" +#include "fastrtps/builtin/discovery/endpoint/EDP.h" +#include "fastrtps/builtin/discovery/endpoint/EDPSimpleListeners.h" +#include "fastrtps/builtin/discovery/endpoint/EDPSimpleTopicDataType.h" namespace eprosima { namespace rtps { diff --git a/include/eprosimartps/rtps/builtin/discovery/endpoint/EDPSimpleListeners.h b/include/fastrtps/rtps/builtin/discovery/endpoint/EDPSimpleListeners.h similarity index 89% rename from include/eprosimartps/rtps/builtin/discovery/endpoint/EDPSimpleListeners.h rename to include/fastrtps/rtps/builtin/discovery/endpoint/EDPSimpleListeners.h index c4bdb40d663..492f953cfc3 100644 --- a/include/eprosimartps/rtps/builtin/discovery/endpoint/EDPSimpleListeners.h +++ b/include/fastrtps/rtps/builtin/discovery/endpoint/EDPSimpleListeners.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,10 +14,10 @@ #ifndef EDPSIMPLELISTENER_H_ #define EDPSIMPLELISTENER_H_ -#include "eprosimartps/pubsub/SubscriberListener.h" +#include "fastrtps/pubsub/SubscriberListener.h" -#include "eprosimartps/writer/ReaderProxyData.h" -#include "eprosimartps/reader/WriterProxyData.h" +#include "fastrtps/writer/ReaderProxyData.h" +#include "fastrtps/reader/WriterProxyData.h" using namespace eprosima::pubsub; diff --git a/include/eprosimartps/rtps/builtin/discovery/endpoint/EDPSimpleTopicDataType.h b/include/fastrtps/rtps/builtin/discovery/endpoint/EDPSimpleTopicDataType.h similarity index 86% rename from include/eprosimartps/rtps/builtin/discovery/endpoint/EDPSimpleTopicDataType.h rename to include/fastrtps/rtps/builtin/discovery/endpoint/EDPSimpleTopicDataType.h index cf04dd10817..99723e5db0a 100644 --- a/include/eprosimartps/rtps/builtin/discovery/endpoint/EDPSimpleTopicDataType.h +++ b/include/fastrtps/rtps/builtin/discovery/endpoint/EDPSimpleTopicDataType.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,8 +14,8 @@ #ifndef EDPSIMPLETOPICDATATYPE_H_ #define EDPSIMPLETOPICDATATYPE_H_ -#include "eprosimartps/pubsub/TopicDataType.h" -#include "eprosimartps/common/types/CDRMessage_t.h" +#include "fastrtps/pubsub/TopicDataType.h" +#include "fastrtps/common/types/CDRMessage_t.h" using namespace eprosima::pubsub; diff --git a/include/eprosimartps/rtps/builtin/discovery/endpoint/EDPStatic.h b/include/fastrtps/rtps/builtin/discovery/endpoint/EDPStatic.h similarity index 95% rename from include/eprosimartps/rtps/builtin/discovery/endpoint/EDPStatic.h rename to include/fastrtps/rtps/builtin/discovery/endpoint/EDPStatic.h index 0716a1fb752..294b2cc1004 100644 --- a/include/eprosimartps/rtps/builtin/discovery/endpoint/EDPStatic.h +++ b/include/fastrtps/rtps/builtin/discovery/endpoint/EDPStatic.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,8 +15,8 @@ #define EDPSTATIC_H_ -#include "eprosimartps/builtin/discovery/endpoint/EDP.h" -#include "eprosimartps/builtin/discovery/endpoint/EDPStaticXML.h" +#include "fastrtps/builtin/discovery/endpoint/EDP.h" +#include "fastrtps/builtin/discovery/endpoint/EDPStaticXML.h" namespace eprosima { namespace rtps { diff --git a/include/eprosimartps/rtps/builtin/discovery/endpoint/EDPStaticXML.h b/include/fastrtps/rtps/builtin/discovery/endpoint/EDPStaticXML.h similarity index 97% rename from include/eprosimartps/rtps/builtin/discovery/endpoint/EDPStaticXML.h rename to include/fastrtps/rtps/builtin/discovery/endpoint/EDPStaticXML.h index 808e928a132..d1fc8bc3544 100644 --- a/include/eprosimartps/rtps/builtin/discovery/endpoint/EDPStaticXML.h +++ b/include/fastrtps/rtps/builtin/discovery/endpoint/EDPStaticXML.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/include/eprosimartps/rtps/builtin/discovery/participant/PDPSimple.h b/include/fastrtps/rtps/builtin/discovery/participant/PDPSimple.h similarity index 95% rename from include/eprosimartps/rtps/builtin/discovery/participant/PDPSimple.h rename to include/fastrtps/rtps/builtin/discovery/participant/PDPSimple.h index 962f23bad41..26457ec56b6 100644 --- a/include/eprosimartps/rtps/builtin/discovery/participant/PDPSimple.h +++ b/include/fastrtps/rtps/builtin/discovery/participant/PDPSimple.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,9 +14,9 @@ #ifndef PDPSIMPLE_H_ #define PDPSIMPLE_H_ -#include "eprosimartps/rtps/builtin/discovery/participant/PDPSimpleListener.h" -#include "eprosimartps/rtps/builtin/discovery/participant/PDPSimpleTopicDataType.h" -#include "eprosimartps/rtps/attributes/RTPSParticipantAttributes.h" +#include "fastrtps/rtps/builtin/discovery/participant/PDPSimpleListener.h" +#include "fastrtps/rtps/builtin/discovery/participant/PDPSimpleTopicDataType.h" +#include "fastrtps/rtps/attributes/RTPSParticipantAttributes.h" namespace eprosima { namespace rtps { diff --git a/include/eprosimartps/rtps/builtin/discovery/participant/PDPSimpleListener.h b/include/fastrtps/rtps/builtin/discovery/participant/PDPSimpleListener.h similarity index 87% rename from include/eprosimartps/rtps/builtin/discovery/participant/PDPSimpleListener.h rename to include/fastrtps/rtps/builtin/discovery/participant/PDPSimpleListener.h index d6193d851eb..3b3ba4eab00 100644 --- a/include/eprosimartps/rtps/builtin/discovery/participant/PDPSimpleListener.h +++ b/include/fastrtps/rtps/builtin/discovery/participant/PDPSimpleListener.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,9 +13,9 @@ #ifndef PDPSIMPLELISTENER_H_ #define PDPSIMPLELISTENER_H_ -#include "eprosimartps/pubsub/SubscriberListener.h" -#include "eprosimartps/qos/ParameterList.h" -#include "eprosimartps/RTPSParticipantProxyData.h" +#include "fastrtps/pubsub/SubscriberListener.h" +#include "fastrtps/qos/ParameterList.h" +#include "fastrtps/RTPSParticipantProxyData.h" using namespace eprosima::pubsub; namespace eprosima { diff --git a/include/eprosimartps/rtps/builtin/discovery/participant/PDPSimpleTopicDataType.h b/include/fastrtps/rtps/builtin/discovery/participant/PDPSimpleTopicDataType.h similarity index 86% rename from include/eprosimartps/rtps/builtin/discovery/participant/PDPSimpleTopicDataType.h rename to include/fastrtps/rtps/builtin/discovery/participant/PDPSimpleTopicDataType.h index 1a47f7116e6..3e9313f5413 100644 --- a/include/eprosimartps/rtps/builtin/discovery/participant/PDPSimpleTopicDataType.h +++ b/include/fastrtps/rtps/builtin/discovery/participant/PDPSimpleTopicDataType.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,8 +14,8 @@ #ifndef PDPSIMPLETOPICDATATYPE_H_ #define PDPSIMPLETOPICDATATYPE_H_ -#include "eprosimartps/pubsub/TopicDataType.h" -#include "eprosimartps/common/types/CDRMessage_t.h" +#include "fastrtps/pubsub/TopicDataType.h" +#include "fastrtps/common/types/CDRMessage_t.h" using namespace eprosima::pubsub; diff --git a/include/eprosimartps/rtps/builtin/discovery/participant/timedevent/RemoteParticipantLeaseDuration.h b/include/fastrtps/rtps/builtin/discovery/participant/timedevent/RemoteParticipantLeaseDuration.h similarity index 90% rename from include/eprosimartps/rtps/builtin/discovery/participant/timedevent/RemoteParticipantLeaseDuration.h rename to include/fastrtps/rtps/builtin/discovery/participant/timedevent/RemoteParticipantLeaseDuration.h index 7d28c01d9c2..ef93efb06f1 100644 --- a/include/eprosimartps/rtps/builtin/discovery/participant/timedevent/RemoteParticipantLeaseDuration.h +++ b/include/fastrtps/rtps/builtin/discovery/participant/timedevent/RemoteParticipantLeaseDuration.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,8 +13,8 @@ #ifndef RTPSParticipantLEASEDURATION_H_ #define RTPSParticipantLEASEDURATION_H_ -#include "eprosimartps/common/types/Guid.h" -#include "eprosimartps/utils/TimedEvent.h" +#include "fastrtps/common/types/Guid.h" +#include "fastrtps/utils/TimedEvent.h" diff --git a/include/eprosimartps/rtps/builtin/discovery/participant/timedevent/ResendParticipantProxyDataPeriod.h b/include/fastrtps/rtps/builtin/discovery/participant/timedevent/ResendParticipantProxyDataPeriod.h similarity index 88% rename from include/eprosimartps/rtps/builtin/discovery/participant/timedevent/ResendParticipantProxyDataPeriod.h rename to include/fastrtps/rtps/builtin/discovery/participant/timedevent/ResendParticipantProxyDataPeriod.h index 117c8f62be6..444c15a36f1 100644 --- a/include/eprosimartps/rtps/builtin/discovery/participant/timedevent/ResendParticipantProxyDataPeriod.h +++ b/include/fastrtps/rtps/builtin/discovery/participant/timedevent/ResendParticipantProxyDataPeriod.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,8 +15,8 @@ #define RESENDDATAPERIOD_H_ -#include "eprosimartps/utils/TimedEvent.h" -#include "eprosimartps/common/types/CDRMessage_t.h" +#include "fastrtps/utils/TimedEvent.h" +#include "fastrtps/common/types/CDRMessage_t.h" namespace eprosima { namespace rtps { diff --git a/include/eprosimartps/rtps/builtin/liveliness/WLP.h b/include/fastrtps/rtps/builtin/liveliness/WLP.h similarity index 89% rename from include/eprosimartps/rtps/builtin/liveliness/WLP.h rename to include/fastrtps/rtps/builtin/liveliness/WLP.h index bad458b9261..36b00c20e94 100644 --- a/include/eprosimartps/rtps/builtin/liveliness/WLP.h +++ b/include/fastrtps/rtps/builtin/liveliness/WLP.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -20,14 +20,14 @@ #include #include -#include "eprosimartps/common/types/Time_t.h" -#include "eprosimartps/common/types/Locator.h" +#include "fastrtps/common/types/Time_t.h" +#include "fastrtps/common/types/Locator.h" -#include "eprosimartps/common/types/Time_t.h" -#include "eprosimartps/common/types/Locator.h" +#include "fastrtps/common/types/Time_t.h" +#include "fastrtps/common/types/Locator.h" -#include "eprosimartps/builtin/liveliness/WLPListener.h" -#include "eprosimartps/builtin/liveliness/WLPTopicDataType.h" +#include "fastrtps/builtin/liveliness/WLPListener.h" +#include "fastrtps/builtin/liveliness/WLPTopicDataType.h" namespace eprosima { namespace rtps { diff --git a/include/eprosimartps/rtps/builtin/liveliness/WLPListener.h b/include/fastrtps/rtps/builtin/liveliness/WLPListener.h similarity index 77% rename from include/eprosimartps/rtps/builtin/liveliness/WLPListener.h rename to include/fastrtps/rtps/builtin/liveliness/WLPListener.h index 051218465f9..c993d64d774 100644 --- a/include/eprosimartps/rtps/builtin/liveliness/WLPListener.h +++ b/include/fastrtps/rtps/builtin/liveliness/WLPListener.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,11 +14,11 @@ #ifndef WLPLISTENER_H_ #define WLPLISTENER_H_ -#include "eprosimartps/pubsub/SubscriberListener.h" -#include "eprosimartps/common/types/Guid.h" -#include "eprosimartps/qos/QosPolicies.h" -#include "eprosimartps/common/types/InstanceHandle.h" -#include "eprosimartps/qos/ParameterList.h" +#include "fastrtps/pubsub/SubscriberListener.h" +#include "fastrtps/common/types/Guid.h" +#include "fastrtps/qos/QosPolicies.h" +#include "fastrtps/common/types/InstanceHandle.h" +#include "fastrtps/qos/ParameterList.h" using namespace eprosima::pubsub; diff --git a/include/eprosimartps/rtps/builtin/liveliness/WLPTopicDataType.h b/include/fastrtps/rtps/builtin/liveliness/WLPTopicDataType.h similarity index 81% rename from include/eprosimartps/rtps/builtin/liveliness/WLPTopicDataType.h rename to include/fastrtps/rtps/builtin/liveliness/WLPTopicDataType.h index a54b48c5dc6..5a3d16a2e7a 100644 --- a/include/eprosimartps/rtps/builtin/liveliness/WLPTopicDataType.h +++ b/include/fastrtps/rtps/builtin/liveliness/WLPTopicDataType.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,9 +14,9 @@ #ifndef WLPTOPICDATATYPE_H_ #define WLPTOPICDATATYPE_H_ -#include "eprosimartps/pubsub/TopicDataType.h" -#include "eprosimartps/common/types/CDRMessage_t.h" -#include "eprosimartps/qos/QosPolicies.h" +#include "fastrtps/pubsub/TopicDataType.h" +#include "fastrtps/common/types/CDRMessage_t.h" +#include "fastrtps/qos/QosPolicies.h" using namespace eprosima::pubsub; diff --git a/include/eprosimartps/rtps/builtin/liveliness/timedevent/WLivelinessPeriodicAssertion.h b/include/fastrtps/rtps/builtin/liveliness/timedevent/WLivelinessPeriodicAssertion.h similarity index 86% rename from include/eprosimartps/rtps/builtin/liveliness/timedevent/WLivelinessPeriodicAssertion.h rename to include/fastrtps/rtps/builtin/liveliness/timedevent/WLivelinessPeriodicAssertion.h index 159012b3e58..627861d6504 100644 --- a/include/eprosimartps/rtps/builtin/liveliness/timedevent/WLivelinessPeriodicAssertion.h +++ b/include/fastrtps/rtps/builtin/liveliness/timedevent/WLivelinessPeriodicAssertion.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,9 +14,9 @@ #ifndef WLIVELINESSPERIODICASSERTION_H_ #define WLIVELINESSPERIODICASSERTION_H_ -#include "eprosimartps/qos/QosPolicies.h" -#include "eprosimartps/utils/TimedEvent.h" -#include "eprosimartps/qos/ParameterList.h" +#include "fastrtps/qos/QosPolicies.h" +#include "fastrtps/utils/TimedEvent.h" +#include "fastrtps/qos/ParameterList.h" using namespace eprosima::pubsub; diff --git a/include/eprosimartps/rtps/common/CDRMessage_t.h b/include/fastrtps/rtps/common/CDRMessage_t.h similarity index 93% rename from include/eprosimartps/rtps/common/CDRMessage_t.h rename to include/fastrtps/rtps/common/CDRMessage_t.h index 93566235b05..b9cfb927299 100644 --- a/include/eprosimartps/rtps/common/CDRMessage_t.h +++ b/include/fastrtps/rtps/common/CDRMessage_t.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,10 +13,11 @@ #ifndef CDRMESSAGE_T_H_ #define CDRMESSAGE_T_H_ -#include "eprosimartps/rtps/common/Types.h" +#include "fastrtps/rtps/common/Types.h" #include namespace eprosima{ +namespace fastrtps{ namespace rtps{ @@ -69,7 +70,7 @@ struct CDRMessage_t{ //!Endianness of the message. Endianness_t msg_endian; }; - +} } } diff --git a/include/eprosimartps/rtps/common/CacheChange.h b/include/fastrtps/rtps/common/CacheChange.h similarity index 91% rename from include/eprosimartps/rtps/common/CacheChange.h rename to include/fastrtps/rtps/common/CacheChange.h index 186530d823b..c760c2f4516 100644 --- a/include/eprosimartps/rtps/common/CacheChange.h +++ b/include/fastrtps/rtps/common/CacheChange.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,14 +13,15 @@ #ifndef CACHECHANGE_H_ #define CACHECHANGE_H_ -#include "eprosimartps/rtps/common/Types.h" -#include "eprosimartps/rtps/common/Guid.h" -#include "eprosimartps/rtps/common/SequenceNumber.h" -#include "eprosimartps/rtps/common/SerializedPayload.h" -#include "eprosimartps/rtps/common/Time_t.h" -#include "eprosimartps/rtps/common/InstanceHandle.h" +#include "fastrtps/rtps/common/Types.h" +#include "fastrtps/rtps/common/Guid.h" +#include "fastrtps/rtps/common/SequenceNumber.h" +#include "fastrtps/rtps/common/SerializedPayload.h" +#include "fastrtps/rtps/common/Time_t.h" +#include "fastrtps/rtps/common/InstanceHandle.h" namespace eprosima{ +namespace fastrtps{ namespace rtps{ /** @@ -189,7 +190,7 @@ class ChangeFromWriter_t - +} } } diff --git a/include/eprosimartps/rtps/common/Guid.h b/include/fastrtps/rtps/common/Guid.h similarity index 97% rename from include/eprosimartps/rtps/common/Guid.h rename to include/fastrtps/rtps/common/Guid.h index c9ede2c96e5..dbbe83995a4 100644 --- a/include/eprosimartps/rtps/common/Guid.h +++ b/include/fastrtps/rtps/common/Guid.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,10 +13,11 @@ #ifndef RTPS_GUID_H_ #define RTPS_GUID_H_ #include -#include "eprosimartps/config/eprosimartps_dll.h" -#include "eprosimartps/rtps/common/Types.h" +#include "fastrtps/config/fastrtps_dll.h" +#include "fastrtps/rtps/common/Types.h" namespace eprosima{ +namespace fastrtps{ namespace rtps{ @@ -232,7 +233,7 @@ inline std::ostream& operator<<(std::ostream& output,const GUID_t& guid) return output; } - +} } } diff --git a/include/eprosimartps/rtps/common/InstanceHandle.h b/include/fastrtps/rtps/common/InstanceHandle.h similarity index 91% rename from include/eprosimartps/rtps/common/InstanceHandle.h rename to include/fastrtps/rtps/common/InstanceHandle.h index 1b86838ff25..8a19b25e26b 100644 --- a/include/eprosimartps/rtps/common/InstanceHandle.h +++ b/include/fastrtps/rtps/common/InstanceHandle.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -12,11 +12,12 @@ #ifndef INSTANCEHANDLE_H_ #define INSTANCEHANDLE_H_ -#include "eprosimartps/config/eprosimartps_dll.h" -#include "eprosimartps/rtps/common/Types.h" -#include "eprosimartps/rtps/common/Guid.h" +#include "fastrtps/config/fastrtps_dll.h" +#include "fastrtps/rtps/common/Types.h" +#include "fastrtps/rtps/common/Guid.h" namespace eprosima{ +namespace fastrtps{ namespace rtps{ /** @@ -105,7 +106,7 @@ inline std::ostream& operator<<(std::ostream& output,const InstanceHandle_t& iHa output << (int)iHandle.value[15] << std::dec; return output; } - +} } } diff --git a/include/eprosimartps/rtps/common/Locator.h b/include/fastrtps/rtps/common/Locator.h similarity index 95% rename from include/eprosimartps/rtps/common/Locator.h rename to include/fastrtps/rtps/common/Locator.h index 6a62f350ee1..264e361a797 100644 --- a/include/eprosimartps/rtps/common/Locator.h +++ b/include/fastrtps/rtps/common/Locator.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -12,11 +12,12 @@ #ifndef RTPS_ELEM_LOCATOR_H_ #define RTPS_ELEM_LOCATOR_H_ -#include "eprosimartps/config/eprosimartps_dll.h" -#include "eprosimartps/rtps/common/Types.h" +#include "fastrtps/config/fastrtps_dll.h" +#include "fastrtps/rtps/common/Types.h" #include #include namespace eprosima{ +namespace fastrtps{ namespace rtps{ #define LOCATOR_INVALID(loc) {loc.kind=LOCATOR_KIND_INVALID;loc.port= LOCATOR_PORT_INVALID;LOCATOR_ADDRESS_INVALID(loc.address);} @@ -174,7 +175,7 @@ class RTPS_DllAPI LocatorList_t{ }; - +} } } diff --git a/include/eprosimartps/rtps/common/MatchingInfo.h b/include/fastrtps/rtps/common/MatchingInfo.h similarity index 90% rename from include/eprosimartps/rtps/common/MatchingInfo.h rename to include/fastrtps/rtps/common/MatchingInfo.h index e490d3bed88..34f8e9fea13 100644 --- a/include/eprosimartps/rtps/common/MatchingInfo.h +++ b/include/fastrtps/rtps/common/MatchingInfo.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,9 +14,10 @@ #ifndef MATCHINGINFO_H_ #define MATCHINGINFO_H_ -#include "eprosimartps/rtps/common/Guid.h" +#include "fastrtps/rtps/common/Guid.h" namespace eprosima{ +namespace fastrtps{ namespace rtps{ /** @@ -41,7 +42,7 @@ class MatchingInfo MatchingStatus status; GUID_t remoteEndpointGuid; }; - +} } } diff --git a/include/eprosimartps/rtps/common/SequenceNumber.h b/include/fastrtps/rtps/common/SequenceNumber.h similarity index 96% rename from include/eprosimartps/rtps/common/SequenceNumber.h rename to include/fastrtps/rtps/common/SequenceNumber.h index 72b9d3b30a1..19a92a28833 100644 --- a/include/eprosimartps/rtps/common/SequenceNumber.h +++ b/include/fastrtps/rtps/common/SequenceNumber.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -12,14 +12,15 @@ #ifndef RPTS_ELEM_SEQNUM_H_ #define RPTS_ELEM_SEQNUM_H_ -#include "eprosimartps/config/eprosimartps_dll.h" -#include "eprosimartps/rtps/common/Types.h" +#include "fastrtps/config/fastrtps_dll.h" +#include "fastrtps/rtps/common/Types.h" #include #include #include #include namespace eprosima{ +namespace fastrtps{ namespace rtps{ @@ -258,7 +259,7 @@ inline std::ostream& operator<<(std::ostream& output, SequenceNumberSet_t& sns){ } - +} } } diff --git a/include/eprosimartps/rtps/common/SerializedPayload.h b/include/fastrtps/rtps/common/SerializedPayload.h similarity index 91% rename from include/eprosimartps/rtps/common/SerializedPayload.h rename to include/fastrtps/rtps/common/SerializedPayload.h index 02409c6452b..a67096de8ee 100644 --- a/include/eprosimartps/rtps/common/SerializedPayload.h +++ b/include/fastrtps/rtps/common/SerializedPayload.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -12,8 +12,8 @@ #ifndef SERIALIZEDPAYLOAD_H_ #define SERIALIZEDPAYLOAD_H_ -#include "eprosimartps/config/eprosimartps_dll.h" -#include "eprosimartps/rtps/common/Types.h" +#include "fastrtps/config/fastrtps_dll.h" +#include "fastrtps/rtps/common/Types.h" #include #include #include @@ -22,6 +22,7 @@ namespace eprosima{ +namespace fastrtps{ namespace rtps{ //Pre define data encapsulation schemes #define CDR_BE 0x0000 @@ -83,7 +84,7 @@ struct RTPS_DllAPI SerializedPayload_t{ data = NULL; } }; - +} } }; diff --git a/include/eprosimartps/rtps/common/Time_t.h b/include/fastrtps/rtps/common/Time_t.h similarity index 94% rename from include/eprosimartps/rtps/common/Time_t.h rename to include/fastrtps/rtps/common/Time_t.h index e01fe6b9f8a..336bbec1e7f 100644 --- a/include/eprosimartps/rtps/common/Time_t.h +++ b/include/fastrtps/rtps/common/Time_t.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -12,12 +12,13 @@ #ifndef TIME_T_H_ #define TIME_T_H_ -#include "eprosimartps/config/eprosimartps_dll.h" +#include "fastrtps/config/fastrtps_dll.h" #include #include #include namespace eprosima{ +namespace fastrtps{ namespace rtps{ //!Structure Time_t, used to describe times. struct RTPS_DllAPI Time_t{ @@ -106,7 +107,7 @@ const Time_t c_TimeZero(0,0); typedef Time_t Duration_t; - +} } } diff --git a/include/eprosimartps/rtps/common/Types.h b/include/fastrtps/rtps/common/Types.h similarity index 95% rename from include/eprosimartps/rtps/common/Types.h rename to include/fastrtps/rtps/common/Types.h index 751eb8f616f..68eca1e0242 100644 --- a/include/eprosimartps/rtps/common/Types.h +++ b/include/fastrtps/rtps/common/Types.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -20,10 +20,11 @@ /** * @namespace eprosima - * @ingroup EPROSIMARTPSAPIREFERENCE + * @ingroup fastrtpsAPIREFERENCE * eProsima namespace. It contains everything. */ namespace eprosima{ +namespace fastrtps{ /** * RTPS namespace. Functions and structures dedicated to implement the RTPS protocol. @@ -124,7 +125,7 @@ const ProtocolVersion_t c_ProtocolVersion(2,2); typedef octet VendorId_t[2]; const VendorId_t c_eProsimaVendorId={0x01,0x0F}; - +} } } diff --git a/include/fastrtps/rtps/common/all_common.h b/include/fastrtps/rtps/common/all_common.h new file mode 100644 index 00000000000..e2e08abeb2d --- /dev/null +++ b/include/fastrtps/rtps/common/all_common.h @@ -0,0 +1,28 @@ +/************************************************************************* + * Copyright (c) 2014 eProsima. All rights reserved. + * + * This copy of eProsima RTPS is licensed to you under the terms described in the + * fastrtps_LIBRARY_LICENSE file included in this distribution. + * + *************************************************************************/ + +/** + * @file all_common.h + */ + +#ifndef ALL_COMMON_H_ +#define ALL_COMMON_H_ + +#include "fastrtps/rtps/common/Types.h" +#include "fastrtps/rtps/common/CDRMessage_t.h" +#include "fastrtps/rtps/common/Guid.h" +#include "fastrtps/rtps/common/InstanceHandle.h" +#include "fastrtps/rtps/common/Locator.h" +#include "fastrtps/rtps/common/SequenceNumber.h" +#include "fastrtps/rtps/common/SerializedPayload.h" +#include "fastrtps/rtps/common/Time_t.h" +#include "fastrtps/rtps/common/CacheChange.h" + + + +#endif /* ALL_COMMON_H_ */ diff --git a/include/eprosimartps/rtps/history/CacheChangePool.h b/include/fastrtps/rtps/history/CacheChangePool.h similarity index 94% rename from include/eprosimartps/rtps/history/CacheChangePool.h rename to include/fastrtps/rtps/history/CacheChangePool.h index 7135adf912f..6bf29996496 100644 --- a/include/eprosimartps/rtps/history/CacheChangePool.h +++ b/include/fastrtps/rtps/history/CacheChangePool.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -24,6 +24,7 @@ namespace eprosima { +namespace fastrtps{ namespace rtps { struct CacheChange_t; @@ -52,7 +53,7 @@ class CacheChangePool { std::vector m_allCaches; bool allocateGroup(uint16_t pool_size); }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/history/History.h b/include/fastrtps/rtps/history/History.h similarity index 94% rename from include/eprosimartps/rtps/history/History.h rename to include/fastrtps/rtps/history/History.h index f1325434f75..05c2f90fb6b 100644 --- a/include/eprosimartps/rtps/history/History.h +++ b/include/fastrtps/rtps/history/History.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,11 +15,11 @@ #define HISTORY_H_ -#include "eprosimartps/rtps/history/CacheChangePool.h" +#include "fastrtps/rtps/history/CacheChangePool.h" -#include "eprosimartps/rtps/common/SequenceNumber.h" -#include "eprosimartps/rtps/common/Guid.h" -#include "eprosimartps/rtps/attributes/HistoryAttributes.h" +#include "fastrtps/rtps/common/SequenceNumber.h" +#include "fastrtps/rtps/common/Guid.h" +#include "fastrtps/rtps/attributes/HistoryAttributes.h" namespace boost @@ -28,6 +28,7 @@ namespace boost } namespace eprosima { +namespace fastrtps{ namespace rtps { @@ -140,7 +141,7 @@ class History boost::recursive_mutex* mp_mutex; }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/history/ReaderHistory.h b/include/fastrtps/rtps/history/ReaderHistory.h similarity index 94% rename from include/eprosimartps/rtps/history/ReaderHistory.h rename to include/fastrtps/rtps/history/ReaderHistory.h index 907a7af19a8..082725b823b 100644 --- a/include/eprosimartps/rtps/history/ReaderHistory.h +++ b/include/fastrtps/rtps/history/ReaderHistory.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,9 +14,10 @@ #ifndef READERHISTORY_H_ #define READERHISTORY_H_ -#include "eprosimartps/rtps/history/History.h" +#include "fastrtps/rtps/history/History.h" namespace eprosima { +namespace fastrtps{ namespace rtps { struct FirstLastSeqNum @@ -84,6 +85,7 @@ class ReaderHistory: public History { RTPSReader* mp_reader; }; +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/history/WriterHistory.h b/include/fastrtps/rtps/history/WriterHistory.h similarity index 93% rename from include/eprosimartps/rtps/history/WriterHistory.h rename to include/fastrtps/rtps/history/WriterHistory.h index 47d87badde4..0fbf0ff67ad 100644 --- a/include/eprosimartps/rtps/history/WriterHistory.h +++ b/include/fastrtps/rtps/history/WriterHistory.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,9 +14,10 @@ #ifndef WRITERHISTORY_H_ #define WRITERHISTORY_H_ -#include "eprosimartps/rtps/history/History.h" +#include "fastrtps/rtps/history/History.h" namespace eprosima { +namespace fastrtps{ namespace rtps { class RTPSWriter; @@ -64,7 +65,7 @@ class WriterHistory : public History //!Pointer to the associated RTPSWriter; RTPSWriter* mp_writer; }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/messages/CDRMessage.h b/include/fastrtps/rtps/messages/CDRMessage.h similarity index 95% rename from include/eprosimartps/rtps/messages/CDRMessage.h rename to include/fastrtps/rtps/messages/CDRMessage.h index 9c5a9bd1128..ec22fda6015 100644 --- a/include/eprosimartps/rtps/messages/CDRMessage.h +++ b/include/fastrtps/rtps/messages/CDRMessage.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,12 +15,13 @@ #ifndef CDRMESSAGE_H_ #define CDRMESSAGE_H_ -#include "eprosimartps/rtps/common/CDRMessage_t.h" -#include "eprosimartps/pubsub/qos/ParameterTypes.h" +#include "fastrtps/rtps/common/CDRMessage_t.h" +#include "fastrtps/qos/ParameterTypes.h" -using namespace eprosima::pubsub; +using namespace eprosima::fastrtps; namespace eprosima { +namespace fastrtps{ namespace rtps { /** @@ -102,6 +103,8 @@ namespace CDRMessage{ inline bool addOctetVector(CDRMessage_t*msg,std::vector* ocvec); ///@} +} + } } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/messages/CDRMessage.hpp b/include/fastrtps/rtps/messages/CDRMessage.hpp similarity index 99% rename from include/eprosimartps/rtps/messages/CDRMessage.hpp rename to include/fastrtps/rtps/messages/CDRMessage.hpp index 3a0da9a270c..f11de60f695 100644 --- a/include/eprosimartps/rtps/messages/CDRMessage.hpp +++ b/include/fastrtps/rtps/messages/CDRMessage.hpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -16,6 +16,7 @@ namespace eprosima { +namespace fastrtps{ namespace rtps { #include @@ -548,7 +549,7 @@ inline bool CDRMessage::addString(CDRMessage_t*msg,std::string& in_str) - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/messages/CDRMessagePool.h b/include/fastrtps/rtps/messages/CDRMessagePool.h similarity index 87% rename from include/eprosimartps/rtps/messages/CDRMessagePool.h rename to include/fastrtps/rtps/messages/CDRMessagePool.h index df8ea704ecf..ae58b882658 100644 --- a/include/eprosimartps/rtps/messages/CDRMessagePool.h +++ b/include/fastrtps/rtps/messages/CDRMessagePool.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,10 +14,11 @@ #ifndef CDRMESSAGEPOOL_H_ #define CDRMESSAGEPOOL_H_ -#include "eprosimartps/common/types/CDRMessage_t.h" +#include "fastrtps/common/types/CDRMessage_t.h" #include namespace eprosima { +namespace fastrtps{ namespace rtps { @@ -40,7 +41,7 @@ class CDRMessagePool { - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/messages/MessageReceiver.h b/include/fastrtps/rtps/messages/MessageReceiver.h similarity index 94% rename from include/eprosimartps/rtps/messages/MessageReceiver.h rename to include/fastrtps/rtps/messages/MessageReceiver.h index fd28da73bc6..d1142a19ea4 100644 --- a/include/eprosimartps/rtps/messages/MessageReceiver.h +++ b/include/fastrtps/rtps/messages/MessageReceiver.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,12 +15,13 @@ #ifndef MESSAGERECEIVER_H_ #define MESSAGERECEIVER_H_ -#include "eprosimartps/rtps/common/all_common.h" -#include "eprosimartps/pubsub/qos/ParameterList.h" +#include "fastrtps/rtps/common/all_common.h" +#include "fastrtps/qos/ParameterList.h" -using namespace eprosima::pubsub; +using namespace eprosima::fastrtps; namespace eprosima { +namespace fastrtps{ namespace rtps { class ListenResource; @@ -123,7 +124,7 @@ class MessageReceiver { }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/messages/RTPSMessageCreator.h b/include/fastrtps/rtps/messages/RTPSMessageCreator.h similarity index 92% rename from include/eprosimartps/rtps/messages/RTPSMessageCreator.h rename to include/fastrtps/rtps/messages/RTPSMessageCreator.h index 840c3591b81..e3277f6d8be 100644 --- a/include/eprosimartps/rtps/messages/RTPSMessageCreator.h +++ b/include/fastrtps/rtps/messages/RTPSMessageCreator.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,19 +14,18 @@ #ifndef CDRMESSAGECREATOR_H_ #define CDRMESSAGECREATOR_H_ -#include "eprosimartps/rtps/common/CDRMessage_t.h" -#include "eprosimartps/rtps/common/Guid.h" -#include "eprosimartps/rtps/common/SequenceNumber.h" -#include "eprosimartps/rtps/common/CacheChange.h" +#include "fastrtps/rtps/common/CDRMessage_t.h" +#include "fastrtps/rtps/common/Guid.h" +#include "fastrtps/rtps/common/SequenceNumber.h" +#include "fastrtps/rtps/common/CacheChange.h" namespace eprosima { +namespace fastrtps{ + -namespace pubsub{ class ParameterList_t; -} -using namespace pubsub; namespace rtps{ @@ -111,7 +110,7 @@ class RTPSMessageCreator { }; - +} }; /* namespace rtps */ }; /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/messages/RTPSMessageGroup.h b/include/fastrtps/rtps/messages/RTPSMessageGroup.h similarity index 93% rename from include/eprosimartps/rtps/messages/RTPSMessageGroup.h rename to include/fastrtps/rtps/messages/RTPSMessageGroup.h index ba7e965bce6..ec73e07e6f0 100644 --- a/include/eprosimartps/rtps/messages/RTPSMessageGroup.h +++ b/include/fastrtps/rtps/messages/RTPSMessageGroup.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,10 +14,11 @@ #ifndef RTPSMESSAGEGROUP_H_ #define RTPSMESSAGEGROUP_H_ #include -#include "eprosimartps/rtps/common/CDRMessage_t.h" -#include "eprosimartps/pubsub/qos/ParameterList.h" +#include "fastrtps/rtps/common/CDRMessage_t.h" +#include "fastrtps/qos/ParameterList.h" namespace eprosima { +namespace fastrtps{ namespace rtps { /** @@ -74,7 +75,7 @@ static void prepareDataSubM(RTPSWriter* W,CDRMessage_t* submsg,bool expectsInlin }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/messages/RTPS_messages.h b/include/fastrtps/rtps/messages/RTPS_messages.h similarity index 92% rename from include/eprosimartps/rtps/messages/RTPS_messages.h rename to include/fastrtps/rtps/messages/RTPS_messages.h index a516faf6807..689bc65c85d 100644 --- a/include/eprosimartps/rtps/messages/RTPS_messages.h +++ b/include/fastrtps/rtps/messages/RTPS_messages.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,12 +13,13 @@ #ifndef RTPS_MESSAGES_H_ #define RTPS_MESSAGES_H_ -#include "eprosimartps/rtps/common/Types.h" -#include "eprosimartps/rtps/common/Guid.h" +#include "fastrtps/rtps/common/Types.h" +#include "fastrtps/rtps/common/Guid.h" #include #include namespace eprosima{ +namespace fastrtps{ namespace rtps{ // //!@brief Enumeration of the different Submessages types @@ -72,7 +73,7 @@ inline std::ostream& operator<<(std::ostream& output,const SubmessageHeader_t& s output << " length: " << (int)sh.submessageLength << " flags " << (bitset<8>) sh.flags; return output; } - +} } } diff --git a/include/eprosimartps/rtps/participant/RTPSParticipant.h b/include/fastrtps/rtps/participant/RTPSParticipant.h similarity index 90% rename from include/eprosimartps/rtps/participant/RTPSParticipant.h rename to include/fastrtps/rtps/participant/RTPSParticipant.h index 33bb3b89e03..e6162d4fe6b 100644 --- a/include/eprosimartps/rtps/participant/RTPSParticipant.h +++ b/include/fastrtps/rtps/participant/RTPSParticipant.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -25,10 +25,11 @@ //#endif #include -#include "eprosimartps/config/eprosimartps_dll.h" -#include "eprosimartps/rtps/common/Guid.h" +#include "fastrtps/config/fastrtps_dll.h" +#include "fastrtps/rtps/common/Guid.h" namespace eprosima { +namespace fastrtps{ namespace rtps { class RTPSParticipantImpl; @@ -62,7 +63,7 @@ class RTPS_DllAPI RTPSParticipant RTPSParticipantImpl* mp_impl; }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/participant/RTPSParticipantDiscoveryInfo.h b/include/fastrtps/rtps/participant/RTPSParticipantDiscoveryInfo.h similarity index 92% rename from include/eprosimartps/rtps/participant/RTPSParticipantDiscoveryInfo.h rename to include/fastrtps/rtps/participant/RTPSParticipantDiscoveryInfo.h index 73636acf47d..42d4c805c81 100644 --- a/include/eprosimartps/rtps/participant/RTPSParticipantDiscoveryInfo.h +++ b/include/fastrtps/rtps/participant/RTPSParticipantDiscoveryInfo.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,6 +15,7 @@ #define RTPSPARTICIPANTDISCOVERYINFO_H_ namespace eprosima{ +namespace fastrtps{ namespace rtps{ @@ -40,6 +41,7 @@ class RTPSParticipantDiscoveryInfo { }; } } +} diff --git a/include/eprosimartps/rtps/participant/RTPSParticipantImpl.h b/include/fastrtps/rtps/participant/RTPSParticipantImpl.h similarity index 98% rename from include/eprosimartps/rtps/participant/RTPSParticipantImpl.h rename to include/fastrtps/rtps/participant/RTPSParticipantImpl.h index 436a993df44..5b57aff84ca 100644 --- a/include/eprosimartps/rtps/participant/RTPSParticipantImpl.h +++ b/include/fastrtps/rtps/participant/RTPSParticipantImpl.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -31,18 +31,15 @@ namespace asio{class io_service;} class recursive_mutex; } -#include "eprosimartps/rtps/attributes/RTPSParticipantAttributes.h" -#include "eprosimartps/rtps/common/Guid.h" +#include "fastrtps/rtps/attributes/RTPSParticipantAttributes.h" +#include "fastrtps/rtps/common/Guid.h" namespace eprosima { +namespace fastrtps{ -namespace pubsub -{ class WriterQos; class ReaderQos; -} -using namespace pubsub; namespace rtps { @@ -337,7 +334,7 @@ class RTPSParticipantImpl }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/participant/RTPSParticipantListener.h b/include/fastrtps/rtps/participant/RTPSParticipantListener.h similarity index 82% rename from include/eprosimartps/rtps/participant/RTPSParticipantListener.h rename to include/fastrtps/rtps/participant/RTPSParticipantListener.h index afc2d37eb91..00e0f808e08 100644 --- a/include/eprosimartps/rtps/participant/RTPSParticipantListener.h +++ b/include/fastrtps/rtps/participant/RTPSParticipantListener.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,9 +14,10 @@ #ifndef RTPSPARTICIPANTLISTENER_H_ #define RTPSPARTICIPANTLISTENER_H_ -#include "eprosimartps/rtps/participant/RTPSParticipantDiscoveryInfo.h" +#include "fastrtps/rtps/participant/RTPSParticipantDiscoveryInfo.h" namespace eprosima{ +namespace fastrtps{ namespace rtps{ class RTPSParticipant; @@ -28,7 +29,7 @@ class RTPSParticipantListener virtual ~RTPSParticipantListener(){}; virtual void onRTPSParticipantDiscovery(RTPSParticipant* part, RTPSParticipantDiscoveryInfo info){}; }; - +} } } diff --git a/include/eprosimartps/rtps/reader/RTPSReader.h b/include/fastrtps/rtps/reader/RTPSReader.h similarity index 96% rename from include/eprosimartps/rtps/reader/RTPSReader.h rename to include/fastrtps/rtps/reader/RTPSReader.h index dfe4b380c87..89d359dfb76 100644 --- a/include/eprosimartps/rtps/reader/RTPSReader.h +++ b/include/fastrtps/rtps/reader/RTPSReader.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -18,13 +18,13 @@ -#include "eprosimartps/rtps/Endpoint.h" -#include "eprosimartps/rtps/attributes/ReaderAttributes.h" +#include "fastrtps/rtps/Endpoint.h" +#include "fastrtps/rtps/attributes/ReaderAttributes.h" namespace eprosima { - +namespace fastrtps{ namespace rtps { class ReaderListener; @@ -144,7 +144,7 @@ class RTPSReader : public Endpoint */ - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/reader/ReaderListener.h b/include/fastrtps/rtps/reader/ReaderListener.h similarity index 85% rename from include/eprosimartps/rtps/reader/ReaderListener.h rename to include/fastrtps/rtps/reader/ReaderListener.h index 160ae7e1b62..a5102787260 100644 --- a/include/eprosimartps/rtps/reader/ReaderListener.h +++ b/include/fastrtps/rtps/reader/ReaderListener.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef READERLISTENER_H_ #define READERLISTENER_H_ -#include "eprosimartps/rtps/common/MatchingInfo.h" +#include "fastrtps/rtps/common/MatchingInfo.h" namespace eprosima { diff --git a/include/eprosimartps/rtps/reader/StatefulReader.h b/include/fastrtps/rtps/reader/StatefulReader.h similarity index 96% rename from include/eprosimartps/rtps/reader/StatefulReader.h rename to include/fastrtps/rtps/reader/StatefulReader.h index 8ae1818c8d7..cff1cdc25d9 100644 --- a/include/eprosimartps/rtps/reader/StatefulReader.h +++ b/include/fastrtps/rtps/reader/StatefulReader.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,11 +14,12 @@ #define STATEFULREADER_H_ -#include "eprosimartps/rtps/reader/RTPSReader.h" +#include "fastrtps/rtps/reader/RTPSReader.h" namespace eprosima { +namespace fastrtps{ namespace rtps { class WriterProxy; @@ -113,6 +114,7 @@ class StatefulReader:public RTPSReader { std::vector matched_writers; }; +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/reader/StatelessReader.h b/include/fastrtps/rtps/reader/StatelessReader.h similarity index 94% rename from include/eprosimartps/rtps/reader/StatelessReader.h rename to include/fastrtps/rtps/reader/StatelessReader.h index 944d7bc935b..877567044e2 100644 --- a/include/eprosimartps/rtps/reader/StatelessReader.h +++ b/include/fastrtps/rtps/reader/StatelessReader.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,13 +15,14 @@ #define STATELESSREADER_H_ -#include "eprosimartps/reader/RTPSReader.h" +#include "fastrtps/reader/RTPSReader.h" -#include "eprosimartps/pubsub/attributes/SubscriberAttributes.h" +#include "fastrtps/pubsub/attributes/SubscriberAttributes.h" namespace eprosima { +namespace fastrtps{ namespace rtps { /** @@ -90,7 +91,7 @@ class StatelessReader: public RTPSReader { std::vector m_matched_writers; }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/reader/WriterProxy.h b/include/fastrtps/rtps/reader/WriterProxy.h similarity index 91% rename from include/eprosimartps/rtps/reader/WriterProxy.h rename to include/fastrtps/rtps/reader/WriterProxy.h index f45dc9cb54d..8cc04bcb3db 100644 --- a/include/eprosimartps/rtps/reader/WriterProxy.h +++ b/include/fastrtps/rtps/reader/WriterProxy.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -18,13 +18,13 @@ #include #include -#include "eprosimartps/common/types/common_types.h" -#include "eprosimartps/common/types/Locator.h" -#include "eprosimartps/pubsub/attributes/SubscriberAttributes.h" +#include "fastrtps/common/types/common_types.h" +#include "fastrtps/common/types/Locator.h" +#include "fastrtps/pubsub/attributes/SubscriberAttributes.h" -#include "eprosimartps/common/CacheChange.h" -#include "eprosimartps/reader/timedevent/HeartbeatResponseDelay.h" -#include "eprosimartps/reader/timedevent/WriterProxyLiveliness.h" +#include "fastrtps/common/CacheChange.h" +#include "fastrtps/reader/timedevent/HeartbeatResponseDelay.h" +#include "fastrtps/reader/timedevent/WriterProxyLiveliness.h" using namespace eprosima::pubsub; diff --git a/include/eprosimartps/rtps/reader/WriterProxyData.h b/include/fastrtps/rtps/reader/WriterProxyData.h similarity index 87% rename from include/eprosimartps/rtps/reader/WriterProxyData.h rename to include/fastrtps/rtps/reader/WriterProxyData.h index 3bc945e22fc..85eeee0b3b6 100644 --- a/include/eprosimartps/rtps/reader/WriterProxyData.h +++ b/include/fastrtps/rtps/reader/WriterProxyData.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,9 +13,9 @@ #ifndef WRITERPROXYDATA_H_ #define WRITERPROXYDATA_H_ -#include "eprosimartps/pubsub/attributes/TopicAttributes.h" -#include "eprosimartps/qos/ParameterList.h" -#include "eprosimartps/qos/WriterQos.h" +#include "fastrtps/pubsub/attributes/TopicAttributes.h" +#include "fastrtps/qos/ParameterList.h" +#include "fastrtps/qos/WriterQos.h" using namespace eprosima::pubsub; diff --git a/include/eprosimartps/rtps/reader/timedevent/HeartbeatResponseDelay.h b/include/fastrtps/rtps/reader/timedevent/HeartbeatResponseDelay.h similarity index 86% rename from include/eprosimartps/rtps/reader/timedevent/HeartbeatResponseDelay.h rename to include/fastrtps/rtps/reader/timedevent/HeartbeatResponseDelay.h index 88d6a99a5c4..12edefaa9fa 100644 --- a/include/eprosimartps/rtps/reader/timedevent/HeartbeatResponseDelay.h +++ b/include/fastrtps/rtps/reader/timedevent/HeartbeatResponseDelay.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,9 +14,10 @@ #ifndef HEARTBEATRESPONSEDELAY_H_ #define HEARTBEATRESPONSEDELAY_H_ -#include "eprosimartps/utils/TimedEvent.h" -#include "eprosimartps/common/types/CDRMessage_t.h" +#include "fastrtps/utils/TimedEvent.h" +#include "fastrtps/common/types/CDRMessage_t.h" namespace eprosima { +namespace fastrtps{ namespace rtps { class StatefulReader; @@ -38,7 +39,7 @@ class HeartbeatResponseDelay:public TimedEvent { CDRMessage_t m_heartbeat_response_msg; }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/reader/timedevent/WriterProxyLiveliness.h b/include/fastrtps/rtps/reader/timedevent/WriterProxyLiveliness.h similarity index 88% rename from include/eprosimartps/rtps/reader/timedevent/WriterProxyLiveliness.h rename to include/fastrtps/rtps/reader/timedevent/WriterProxyLiveliness.h index 2e07cc6c615..ae4e91fa9d3 100644 --- a/include/eprosimartps/rtps/reader/timedevent/WriterProxyLiveliness.h +++ b/include/fastrtps/rtps/reader/timedevent/WriterProxyLiveliness.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,9 +14,10 @@ #ifndef WRITERPROXYLIVELINESS_H_ #define WRITERPROXYLIVELINESS_H_ -#include "eprosimartps/utils/TimedEvent.h" +#include "fastrtps/utils/TimedEvent.h" namespace eprosima { +namespace fastrtps{ namespace rtps { class WriterProxy; @@ -31,7 +32,7 @@ class WriterProxyLiveliness: public TimedEvent { //!Pointer to the WriterProxy associated with this specific event. WriterProxy* mp_WP; }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/resources/ListenResource.h b/include/fastrtps/rtps/resources/ListenResource.h similarity index 94% rename from include/eprosimartps/rtps/resources/ListenResource.h rename to include/fastrtps/rtps/resources/ListenResource.h index c8b1dcb2301..d357e141b86 100644 --- a/include/eprosimartps/rtps/resources/ListenResource.h +++ b/include/fastrtps/rtps/resources/ListenResource.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -18,6 +18,7 @@ #include namespace eprosima { +namespace fastrtps{ namespace rtps { class ListenResourceImpl; @@ -58,7 +59,7 @@ class ListenResource { bool isListeningTo(Locator_t&loc); }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/resources/ListenResourceImpl.h b/include/fastrtps/rtps/resources/ListenResourceImpl.h similarity index 95% rename from include/eprosimartps/rtps/resources/ListenResourceImpl.h rename to include/fastrtps/rtps/resources/ListenResourceImpl.h index 961161e3073..14923aa7bbf 100644 --- a/include/eprosimartps/rtps/resources/ListenResourceImpl.h +++ b/include/fastrtps/rtps/resources/ListenResourceImpl.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef LISTENRESOURCEIMPL_H_ #define LISTENRESOURCEIMPL _H_ -#include "eprosimartps/rtps/common/Locator.h" +#include "fastrtps/rtps/common/Locator.h" #include @@ -24,6 +24,7 @@ #include namespace eprosima { +namespace fastrtps{ namespace rtps { class RTPSParticipantImpl; @@ -88,7 +89,7 @@ class ListenResourceImpl boost::recursive_mutex m_mutex; }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/resources/ResourceEvent.h b/include/fastrtps/rtps/resources/ResourceEvent.h similarity index 93% rename from include/eprosimartps/rtps/resources/ResourceEvent.h rename to include/fastrtps/rtps/resources/ResourceEvent.h index ad32f81c390..60d0e2201d5 100644 --- a/include/eprosimartps/rtps/resources/ResourceEvent.h +++ b/include/fastrtps/rtps/resources/ResourceEvent.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -28,6 +28,7 @@ class io_service; namespace eprosima { +namespace fastrtps{ namespace rtps { class RTPSParticipantImpl; @@ -61,7 +62,7 @@ class ResourceEvent { RTPSParticipantImpl* mp_RTPSParticipantImpl; }; - +} } } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/resources/ResourceSend.h b/include/fastrtps/rtps/resources/ResourceSend.h similarity index 91% rename from include/eprosimartps/rtps/resources/ResourceSend.h rename to include/fastrtps/rtps/resources/ResourceSend.h index 693bbc20a64..9fd648b639e 100644 --- a/include/eprosimartps/rtps/resources/ResourceSend.h +++ b/include/fastrtps/rtps/resources/ResourceSend.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -22,6 +22,7 @@ class recursive_mutex; } namespace eprosima { +namespace fastrtps{ namespace rtps { class ResourceSendImpl; @@ -40,7 +41,7 @@ class ResourceSend { private: ResourceSendImpl* mp_impl; }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/resources/ResourceSendImpl.h b/include/fastrtps/rtps/resources/ResourceSendImpl.h similarity index 94% rename from include/eprosimartps/rtps/resources/ResourceSendImpl.h rename to include/fastrtps/rtps/resources/ResourceSendImpl.h index 0708529e839..a5936070040 100644 --- a/include/eprosimartps/rtps/resources/ResourceSendImpl.h +++ b/include/fastrtps/rtps/resources/ResourceSendImpl.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -24,9 +24,10 @@ #include #include -#include "eprosimartps/rtps/common/Locator.h" +#include "fastrtps/rtps/common/Locator.h" namespace eprosima { +namespace fastrtps{ namespace rtps { struct CDRMessage_t; @@ -75,7 +76,7 @@ class ResourceSendImpl boost::recursive_mutex* mp_mutex; }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/resources/TimedEvent.h b/include/fastrtps/rtps/resources/TimedEvent.h similarity index 89% rename from include/eprosimartps/rtps/resources/TimedEvent.h rename to include/fastrtps/rtps/resources/TimedEvent.h index 241a9f28d59..981a8ba1a98 100644 --- a/include/eprosimartps/rtps/resources/TimedEvent.h +++ b/include/fastrtps/rtps/resources/TimedEvent.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,7 +15,7 @@ #define TIMEDEVENT_H_ #include -#include "eprosimartps/rtps/common/Time_t.h" +#include "fastrtps/rtps/common/Time_t.h" namespace boost { namespace asio @@ -25,6 +25,7 @@ class io_service; } namespace eprosima { +namespace fastrtps{ namespace rtps { class TimedEventImpl; @@ -57,7 +58,7 @@ class TimedEvent { private: TimedEventImpl* mp_impl; }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/resources/TimedEventImpl.h b/include/fastrtps/rtps/resources/TimedEventImpl.h similarity index 94% rename from include/eprosimartps/rtps/resources/TimedEventImpl.h rename to include/fastrtps/rtps/resources/TimedEventImpl.h index 8ce75aa8697..8f327201492 100644 --- a/include/eprosimartps/rtps/resources/TimedEventImpl.h +++ b/include/fastrtps/rtps/resources/TimedEventImpl.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -26,11 +26,12 @@ #include #include -#include "eprosimartps/rtps/common/Time_t.h" +#include "fastrtps/rtps/common/Time_t.h" namespace eprosima { +namespace fastrtps{ namespace rtps{ class TimedEvent; @@ -82,7 +83,7 @@ class TimedEventImpl { - +} } } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/writer/RTPSWriter.h b/include/fastrtps/rtps/writer/RTPSWriter.h similarity index 96% rename from include/eprosimartps/rtps/writer/RTPSWriter.h rename to include/fastrtps/rtps/writer/RTPSWriter.h index 031bf4fc07e..2796f8d62fe 100644 --- a/include/eprosimartps/rtps/writer/RTPSWriter.h +++ b/include/fastrtps/rtps/writer/RTPSWriter.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,14 +14,14 @@ #ifndef RTPSWRITER_H_ #define RTPSWRITER_H_ -#include "eprosimartps/rtps/Endpoint.h" -#include "eprosimartps/rtps/messages/RTPSMessageGroup.h" -#include "eprosimartps/rtps/attributes/WriterAttributes.h" +#include "fastrtps/rtps/Endpoint.h" +#include "fastrtps/rtps/messages/RTPSMessageGroup.h" +#include "fastrtps/rtps/attributes/WriterAttributes.h" namespace eprosima { - +namespace fastrtps{ namespace rtps { class UnsentChangesNotEmptyEvent; @@ -211,7 +211,7 @@ class RTPSWriter: public Endpoint // UnsentChangesNotEmptyEvent* mp_unsetChangesNotEmpty; }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/writer/ReaderLocator.h b/include/fastrtps/rtps/writer/ReaderLocator.h similarity index 90% rename from include/eprosimartps/rtps/writer/ReaderLocator.h rename to include/fastrtps/rtps/writer/ReaderLocator.h index dec232f7a09..bb3e22098ba 100644 --- a/include/eprosimartps/rtps/writer/ReaderLocator.h +++ b/include/fastrtps/rtps/writer/ReaderLocator.h @@ -2,7 +2,7 @@ * Copyright (c) 20134 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,12 +15,13 @@ #ifndef READERLOCATOR_H_ #define READERLOCATOR_H_ #include -#include "eprosimartps/rtps/common/Locator.h" -#include "eprosimartps/rtps/common/Guid.h" -#include "eprosimartps/rtps/common/SequenceNumber.h" +#include "fastrtps/rtps/common/Locator.h" +#include "fastrtps/rtps/common/Guid.h" +#include "fastrtps/rtps/common/SequenceNumber.h" namespace eprosima { +namespace fastrtps{ namespace rtps { struct CacheChange_t; @@ -77,7 +78,7 @@ class ReaderLocator { */ }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/writer/ReaderProxy.h b/include/fastrtps/rtps/writer/ReaderProxy.h similarity index 91% rename from include/eprosimartps/rtps/writer/ReaderProxy.h rename to include/fastrtps/rtps/writer/ReaderProxy.h index dcc42814c11..b2bcd4f74e2 100644 --- a/include/eprosimartps/rtps/writer/ReaderProxy.h +++ b/include/fastrtps/rtps/writer/ReaderProxy.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -17,17 +17,18 @@ #define READERPROXY_H_ #include -#include "eprosimartps/rtps/common/Types.h" -#include "eprosimartps/rtps/common/Locator.h" -#include "eprosimartps/rtps/common/SequenceNumber.h" -#include "eprosimartps/rtps/common/CacheChange.h" -#include "eprosimartps/rtps/attributes/WriterAttributes.h" +#include "fastrtps/rtps/common/Types.h" +#include "fastrtps/rtps/common/Locator.h" +#include "fastrtps/rtps/common/SequenceNumber.h" +#include "fastrtps/rtps/common/CacheChange.h" +#include "fastrtps/rtps/attributes/WriterAttributes.h" namespace boost { class recursive_mutex; } namespace eprosima { +namespace fastrtps{ namespace rtps { class StatefulWriter; @@ -141,12 +142,12 @@ class ReaderProxy //TODOG FILTER - bool pubsub_is_relevant(CacheChange_t* change); + bool rtps_is_relevant(CacheChange_t* change); boost::recursive_mutex* mp_mutex; }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/writer/StatefulWriter.h b/include/fastrtps/rtps/writer/StatefulWriter.h similarity index 97% rename from include/eprosimartps/rtps/writer/StatefulWriter.h rename to include/fastrtps/rtps/writer/StatefulWriter.h index a32ae39ebd9..2eb6fb44c28 100644 --- a/include/eprosimartps/rtps/writer/StatefulWriter.h +++ b/include/fastrtps/rtps/writer/StatefulWriter.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,10 +15,11 @@ #define STATEFULWRITER_H_ -#include "eprosimartps/rtps/writer/RTPSWriter.h" +#include "fastrtps/rtps/writer/RTPSWriter.h" namespace eprosima { +namespace fastrtps{ namespace rtps { class PeriodicHeartbeat; @@ -207,7 +208,7 @@ class StatefulWriter: public RTPSWriter }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/writer/StatelessWriter.h b/include/fastrtps/rtps/writer/StatelessWriter.h similarity index 94% rename from include/eprosimartps/rtps/writer/StatelessWriter.h rename to include/fastrtps/rtps/writer/StatelessWriter.h index 6cc40fddd0e..dfded9c2939 100644 --- a/include/eprosimartps/rtps/writer/StatelessWriter.h +++ b/include/fastrtps/rtps/writer/StatelessWriter.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,11 +14,12 @@ #ifndef STATELESSWRITER_H_ #define STATELESSWRITER_H_ -#include "eprosimartps/rtps/common/Time_t.h" -#include "eprosimartps/rtps/writer/RTPSWriter.h" -#include "eprosimartps/rtps/writer/ReaderLocator.h" +#include "fastrtps/rtps/common/Time_t.h" +#include "fastrtps/rtps/writer/RTPSWriter.h" +#include "fastrtps/rtps/writer/ReaderLocator.h" namespace eprosima { +namespace fastrtps{ namespace rtps { @@ -115,7 +116,7 @@ class StatelessWriter : public RTPSWriter bool add_locator(RemoteReaderAttributes& rdata,Locator_t& loc); bool remove_locator(Locator_t& loc); }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/writer/WriterListener.h b/include/fastrtps/rtps/writer/WriterListener.h similarity index 79% rename from include/eprosimartps/rtps/writer/WriterListener.h rename to include/fastrtps/rtps/writer/WriterListener.h index 6ecaf0da6ac..5254eb7fb66 100644 --- a/include/eprosimartps/rtps/writer/WriterListener.h +++ b/include/fastrtps/rtps/writer/WriterListener.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,10 +14,10 @@ #ifndef WRITERLISTENER_H_ #define WRITERLISTENER_H_ -#include "eprosimartps/rtps/common/MatchingInfo.h" +#include "fastrtps/rtps/common/MatchingInfo.h" -namespace eprosima -{ +namespace eprosima{ +namespace fastrtps{ namespace rtps{ @@ -28,7 +28,7 @@ class WriterListener virtual ~WriterListener(){}; virtual void onWriterMatched(MatchingInfo info){}; }; - +} } } diff --git a/include/eprosimartps/rtps/writer/timedevent/NackResponseDelay.h b/include/fastrtps/rtps/writer/timedevent/NackResponseDelay.h similarity index 82% rename from include/eprosimartps/rtps/writer/timedevent/NackResponseDelay.h rename to include/fastrtps/rtps/writer/timedevent/NackResponseDelay.h index a5e8afe39b4..76dbc09a540 100644 --- a/include/eprosimartps/rtps/writer/timedevent/NackResponseDelay.h +++ b/include/fastrtps/rtps/writer/timedevent/NackResponseDelay.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,11 +14,12 @@ #ifndef NACKRESPONSEDELAY_H_ #define NACKRESPONSEDELAY_H_ -#include "eprosimartps/rtps/resources/TimedEvent.h" -#include "eprosimartps/rtps/messages/RTPSMessageGroup.h" +#include "fastrtps/rtps/resources/TimedEvent.h" +#include "fastrtps/rtps/messages/RTPSMessageGroup.h" namespace eprosima { +namespace fastrtps{ namespace rtps { class StatefulWriter; @@ -38,7 +39,7 @@ class NackResponseDelay:public TimedEvent { ReaderProxy* mp_RP; RTPSMessageGroup_t m_cdrmessages; }; - +} } } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/writer/timedevent/NackSupressionDuration.h b/include/fastrtps/rtps/writer/timedevent/NackSupressionDuration.h similarity index 87% rename from include/eprosimartps/rtps/writer/timedevent/NackSupressionDuration.h rename to include/fastrtps/rtps/writer/timedevent/NackSupressionDuration.h index 5261976b98b..88ad77fbd06 100644 --- a/include/eprosimartps/rtps/writer/timedevent/NackSupressionDuration.h +++ b/include/fastrtps/rtps/writer/timedevent/NackSupressionDuration.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,9 +14,10 @@ #ifndef NACKSUPRESSIONDURATION_H_ #define NACKSUPRESSIONDURATION_H_ -#include "eprosimartps/rtps/resources/TimedEvent.h" +#include "fastrtps/rtps/resources/TimedEvent.h" namespace eprosima { +namespace fastrtps{ namespace rtps { class StatefulWriter; @@ -37,6 +38,7 @@ class NackSupressionDuration : public TimedEvent ReaderProxy* mp_RP; }; +} } } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/writer/timedevent/PeriodicHeartbeat.h b/include/fastrtps/rtps/writer/timedevent/PeriodicHeartbeat.h similarity index 83% rename from include/eprosimartps/rtps/writer/timedevent/PeriodicHeartbeat.h rename to include/fastrtps/rtps/writer/timedevent/PeriodicHeartbeat.h index 5ab6699d8df..567e32160ca 100644 --- a/include/eprosimartps/rtps/writer/timedevent/PeriodicHeartbeat.h +++ b/include/fastrtps/rtps/writer/timedevent/PeriodicHeartbeat.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,10 +14,11 @@ #ifndef PERIODICHEARTBEAT_H_ #define PERIODICHEARTBEAT_H_ -#include "eprosimartps/rtps/resources/TimedEvent.h" -#include "eprosimartps/rtps/common/CDRMessage_t.h" +#include "fastrtps/rtps/resources/TimedEvent.h" +#include "fastrtps/rtps/common/CDRMessage_t.h" namespace eprosima { +namespace fastrtps{ namespace rtps{ class StatefulWriter; @@ -41,7 +42,7 @@ class PeriodicHeartbeat: public TimedEvent { - +} } } /* namespace eprosima */ diff --git a/include/eprosimartps/rtps/writer/timedevent/UnsentChangesNotEmptyEvent.h b/include/fastrtps/rtps/writer/timedevent/UnsentChangesNotEmptyEvent.h similarity index 86% rename from include/eprosimartps/rtps/writer/timedevent/UnsentChangesNotEmptyEvent.h rename to include/fastrtps/rtps/writer/timedevent/UnsentChangesNotEmptyEvent.h index bd2630271ed..3ebc8317429 100644 --- a/include/eprosimartps/rtps/writer/timedevent/UnsentChangesNotEmptyEvent.h +++ b/include/fastrtps/rtps/writer/timedevent/UnsentChangesNotEmptyEvent.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,9 +14,10 @@ #ifndef UNSENTCHANGESNOTEMPTYEVENT_H_ #define UNSENTCHANGESNOTEMPTYEVENT_H_ -#include "eprosimartps/rtps/resources/TimedEvent.h" +#include "fastrtps/rtps/resources/TimedEvent.h" namespace eprosima { +namespace fastrtps{ namespace rtps { class RTPSWriter; @@ -30,7 +31,7 @@ class UnsentChangesNotEmptyEvent: public TimedEvent { RTPSWriter* mp_writer; }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/pubsub/subscriber/SampleInfo.h b/include/fastrtps/subscriber/SampleInfo.h similarity index 91% rename from include/eprosimartps/pubsub/subscriber/SampleInfo.h rename to include/fastrtps/subscriber/SampleInfo.h index 680e96053ce..ec65ed317f5 100644 --- a/include/eprosimartps/pubsub/subscriber/SampleInfo.h +++ b/include/fastrtps/subscriber/SampleInfo.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #define SAMPLEINFO_H_ namespace eprosima { -namespace pubsub { +namespace fastrtps { /** * Information provided along with a sample when reading data from a Subscriber. @@ -37,7 +37,7 @@ class RTPS_DllAPI SampleInfo_t { InstanceHandle_t iHandle; }; -} /* namespace pubsub */ +} /* namespace */ } /* namespace eprosima */ #endif /* SAMPLEINFO_H_ */ diff --git a/include/eprosimartps/pubsub/subscriber/Subscriber.h b/include/fastrtps/subscriber/Subscriber.h similarity index 95% rename from include/eprosimartps/pubsub/subscriber/Subscriber.h rename to include/fastrtps/subscriber/Subscriber.h index b5b2590d383..6cb30efc84e 100644 --- a/include/eprosimartps/pubsub/subscriber/Subscriber.h +++ b/include/fastrtps/subscriber/Subscriber.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,9 +15,9 @@ #define SUBSCRIBER_H_ #include -#include "eprosimartps/common/types/Locator.h" -#include "eprosimartps/common/types/Guid.h" -#include "eprosimartps/pubsub/attributes/SubscriberAttributes.h" +#include "fastrtps/common/types/Locator.h" +#include "fastrtps/common/types/Guid.h" +#include "fastrtps/attributes/SubscriberAttributes.h" namespace eprosima { diff --git a/include/eprosimartps/pubsub/subscriber/SubscriberListener.h b/include/fastrtps/subscriber/SubscriberListener.h similarity index 88% rename from include/eprosimartps/pubsub/subscriber/SubscriberListener.h rename to include/fastrtps/subscriber/SubscriberListener.h index d056988a5f0..e4b3f6a4e93 100644 --- a/include/eprosimartps/pubsub/subscriber/SubscriberListener.h +++ b/include/fastrtps/subscriber/SubscriberListener.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,8 +13,8 @@ #ifndef SUBLISTENER_H_ #define SUBLISTENER_H_ -#include "eprosimartps/common/types/common_types.h" -#include "eprosimartps/pubsub/MatchingInfo.h" +#include "fastrtps/common/types/common_types.h" +#include "fastrtps/pubsub/MatchingInfo.h" namespace eprosima { namespace pubsub { diff --git a/include/eprosimartps/utils/IPFinder.h b/include/fastrtps/utils/IPFinder.h similarity index 90% rename from include/eprosimartps/utils/IPFinder.h rename to include/fastrtps/utils/IPFinder.h index ed1c971a0f0..ad25d52ce5d 100644 --- a/include/eprosimartps/utils/IPFinder.h +++ b/include/fastrtps/utils/IPFinder.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -33,10 +33,10 @@ #include #include -#include "eprosimartps/rtps/common/Locator.h" +#include "fastrtps/rtps/common/Locator.h" namespace eprosima { - +namespace fastrtps{ using namespace rtps; /** * Find IPs of the computer. @@ -54,7 +54,7 @@ class IPFinder { //!Get the IPAdresses in all interfaces. static bool getIPAddress(LocatorList_t* locators); }; - +} } /* namespace eprosima */ #endif /* IPFINDER_H_ */ diff --git a/include/eprosimartps/utils/ObjectPool.h b/include/fastrtps/utils/ObjectPool.h similarity index 91% rename from include/eprosimartps/utils/ObjectPool.h rename to include/fastrtps/utils/ObjectPool.h index 073fa0f0bdd..6d75d66fd4b 100644 --- a/include/eprosimartps/utils/ObjectPool.h +++ b/include/fastrtps/utils/ObjectPool.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -19,6 +19,7 @@ namespace eprosima { +namespace fastrtps{ namespace rtps { @@ -40,7 +41,7 @@ class ObjectPool { void allocateGroup(); }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/utils/RTPSLog.h b/include/fastrtps/utils/RTPSLog.h similarity index 82% rename from include/eprosimartps/utils/RTPSLog.h rename to include/fastrtps/utils/RTPSLog.h index ee95d574463..67eb0905615 100644 --- a/include/eprosimartps/utils/RTPSLog.h +++ b/include/fastrtps/utils/RTPSLog.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -39,16 +39,14 @@ enum LOG_CATEGORY : uint32_t RTPS_MSG_OUT, RTPS_PROXY_DATA, RTPS_PARTICIPANT, - PUBSUB_PUBLISHER, - PUBSUB_SUBSCRIBER, - PUBSUB_PARTICIPANT + PUBLISHER, + SUBSCRIBER, + PARTICIPANT }; } -using namespace eprosima; - diff --git a/include/eprosimartps/utils/StringMatching.h b/include/fastrtps/utils/StringMatching.h similarity index 90% rename from include/eprosimartps/utils/StringMatching.h rename to include/fastrtps/utils/StringMatching.h index 03d81ded917..b9a2d51f35d 100644 --- a/include/eprosimartps/utils/StringMatching.h +++ b/include/fastrtps/utils/StringMatching.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,6 +15,7 @@ #define STRINGMATCHING_H_ namespace eprosima { +namespace fastrtps{ namespace rtps { /** * Class StringMatching used to match different strings against each other as defined by the POSIX fnmatch API (1003.2-1992 @@ -28,7 +29,7 @@ class StringMatching { static bool matchString(const char* pattern,const char* input); //FIXME: CONVERTIR EN INLINE }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/utils/TimeConversion.h b/include/fastrtps/utils/TimeConversion.h similarity index 95% rename from include/eprosimartps/utils/TimeConversion.h rename to include/fastrtps/utils/TimeConversion.h index 0495e044a4c..7ddf518e73e 100644 --- a/include/eprosimartps/utils/TimeConversion.h +++ b/include/fastrtps/utils/TimeConversion.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,9 +15,10 @@ #define TIMECONVERSION_H_ #include -#include "eprosimartps/rtps/common/Time_t.h" +#include "fastrtps/rtps/common/Time_t.h" namespace eprosima { +namespace fastrtps{ namespace rtps { namespace TimeConv{ @@ -96,7 +97,7 @@ inline Time_t SecondsWithRandOffset2Time_t(double sec, double randoff) }; - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/include/eprosimartps/utils/eClock.h b/include/fastrtps/utils/eClock.h similarity index 89% rename from include/eprosimartps/utils/eClock.h rename to include/fastrtps/utils/eClock.h index b4d96cf0f57..33880d7d96b 100644 --- a/include/eprosimartps/utils/eClock.h +++ b/include/fastrtps/utils/eClock.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -36,11 +36,13 @@ struct timezone #endif -#include "eprosimartps/rtps/common/Time_t.h" +#include "fastrtps/rtps/common/Time_t.h" +using namespace eprosima::fastrtps::rtps; namespace eprosima { -namespace rtps { +namespace fastrtps{ + /** * Clock used to obtain the time in us since 1900. diff --git a/include/eprosimartps/utils/md5.h b/include/fastrtps/utils/md5.h similarity index 98% rename from include/eprosimartps/utils/md5.h rename to include/fastrtps/utils/md5.h index 890c47ba198..c2a7013a000 100755 --- a/include/eprosimartps/utils/md5.h +++ b/include/fastrtps/utils/md5.h @@ -36,7 +36,7 @@ documentation and/or software. #include #include -#include "eprosimartps/config/eprosimartps_dll.h" +#include "fastrtps/config/fastrtps_dll.h" // a small class for calculating MD5 hashes of strings or byte arrays // it is not meant to be fast or secure diff --git a/rtpsgen/build.xml b/rtpsgen/build.xml index ffb8d2605eb..daf832bcd2c 100644 --- a/rtpsgen/build.xml +++ b/rtpsgen/build.xml @@ -150,8 +150,8 @@ Copy version file.<--> - - + + diff --git a/rtpsgen/src/com/eprosima/rtps/idl/templates/RTPSPubSubMain.stg b/rtpsgen/src/com/eprosima/rtps/idl/templates/RTPSPubSubMain.stg index bfc2ac3faac..693943aecb2 100644 --- a/rtpsgen/src/com/eprosima/rtps/idl/templates/RTPSPubSubMain.stg +++ b/rtpsgen/src/com/eprosima/rtps/idl/templates/RTPSPubSubMain.stg @@ -4,7 +4,7 @@ main(ctx, definitions) ::= << $fileHeader(ctx=ctx, file=[ctx.filename, "PubSubMain.cpp"], description=["This file acts as a main entry point to the application."])$ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "$ctx.filename$Publisher.h" #include "$ctx.filename$Subscriber.h" #include "$ctx.filename$PubSubType.h" diff --git a/rtpsgen/src/com/eprosima/rtps/idl/templates/RTPSPubSubTypeHeader.stg b/rtpsgen/src/com/eprosima/rtps/idl/templates/RTPSPubSubTypeHeader.stg index b805bc6c412..2bd359d2281 100644 --- a/rtpsgen/src/com/eprosima/rtps/idl/templates/RTPSPubSubTypeHeader.stg +++ b/rtpsgen/src/com/eprosima/rtps/idl/templates/RTPSPubSubTypeHeader.stg @@ -7,7 +7,7 @@ $fileHeader(ctx=ctx, file=[ctx.filename, "RTPSPubSubType.h"], description=["Thi #ifndef _$ctx.filename;format="toUpper"$_PUBSUBTYPE_H_ #define _$ctx.filename;format="toUpper"$_PUBSUBTYPE_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "$ctx.filename$.h" diff --git a/rtpsgen/src/com/eprosima/rtps/idl/templates/RTPSPublisherHeader.stg b/rtpsgen/src/com/eprosima/rtps/idl/templates/RTPSPublisherHeader.stg index 76f8dea49f2..f0f01b108e3 100644 --- a/rtpsgen/src/com/eprosima/rtps/idl/templates/RTPSPublisherHeader.stg +++ b/rtpsgen/src/com/eprosima/rtps/idl/templates/RTPSPublisherHeader.stg @@ -7,7 +7,7 @@ $fileHeader(ctx=ctx, file=[ctx.filename, "Publisher.h"], description=["This hea #ifndef _$ctx.filename;format="toUpper"$_PUBLISHER_H_ #define _$ctx.filename;format="toUpper"$_PUBLISHER_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" class $ctx.filename$Publisher { diff --git a/rtpsgen/src/com/eprosima/rtps/idl/templates/RTPSSubscriberHeader.stg b/rtpsgen/src/com/eprosima/rtps/idl/templates/RTPSSubscriberHeader.stg index cd3fea69fbd..bbd5e073061 100644 --- a/rtpsgen/src/com/eprosima/rtps/idl/templates/RTPSSubscriberHeader.stg +++ b/rtpsgen/src/com/eprosima/rtps/idl/templates/RTPSSubscriberHeader.stg @@ -7,7 +7,7 @@ $fileHeader(ctx=ctx, file=[ctx.filename, "Subscriber.h"], description=["This he #ifndef _$ctx.filename;format="toUpper"$_SUBSCRIBER_H_ #define _$ctx.filename;format="toUpper"$_SUBSCRIBER_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" class $ctx.filename$Subscriber { diff --git a/rtpsgen/src/com/eprosima/rtps/idl/templates/VS2010.stg b/rtpsgen/src/com/eprosima/rtps/idl/templates/VS2010.stg index 8fad7cee065..50f4ce64de3 100644 --- a/rtpsgen/src/com/eprosima/rtps/idl/templates/VS2010.stg +++ b/rtpsgen/src/com/eprosima/rtps/idl/templates/VS2010.stg @@ -55,7 +55,7 @@ project(solution, project, example, configurations, local) ::= << Level3 $if(it.debug)$Disabled$else$MaxSpeed$endif$ - \$(EPROSIMARTPSHOME)\include;%(AdditionalIncludeDirectories) + \$(fastrtpsHOME)\include;%(AdditionalIncludeDirectories) $preprocessorDefs(conf=it)$;$if(it.dll)$;EPROSIMA_USER_DLL_EXPORT$endif$;$solution.defines : {define |$define$;}$%(PreprocessorDefinitions) NotUsing @@ -118,7 +118,7 @@ projectPubSub(solution, project, example, configurations, local) ::= << Level3 $if(it.debug)$Disabled$else$MaxSpeed$endif$ - \$(EPROSIMARTPSHOME)\include;\$(LIB_BOOST_PATH);%(AdditionalIncludeDirectories) + \$(fastrtpsHOME)\include;\$(LIB_BOOST_PATH);%(AdditionalIncludeDirectories) _WIN32_WINDOWS;WIN32;EPROSIMA_WIN32;$if(it.dll)$EPROSIMA_ALL_DYN_LINK;$endif$BOOST_ALL_DYN_LINK;$if(it.debug)$_DEBUG;$else$NDEBUG;$endif$ NotUsing diff --git a/rtpsgen/src/com/eprosima/rtps/idl/templates/VS2013.stg b/rtpsgen/src/com/eprosima/rtps/idl/templates/VS2013.stg index 89e739a8cf6..61ccec6550e 100644 --- a/rtpsgen/src/com/eprosima/rtps/idl/templates/VS2013.stg +++ b/rtpsgen/src/com/eprosima/rtps/idl/templates/VS2013.stg @@ -58,7 +58,7 @@ project(solution, project, example, configurations, local) ::= << Level3 $if(it.debug)$Disabled$else$MaxSpeed$endif$ - \$(EPROSIMARTPSHOME)\include;%(AdditionalIncludeDirectories) + \$(fastrtpsHOME)\include;%(AdditionalIncludeDirectories) $preprocessorDefs(conf=it)$;$if(it.dll)$;EPROSIMA_USER_DLL_EXPORT$endif$;$solution.defines : {define |$define$;}$%(PreprocessorDefinitions) NotUsing @@ -122,7 +122,7 @@ projectPubSub(solution, project, example, configurations, local) ::= << Level3 $if(it.debug)$Disabled$else$MaxSpeed$endif$ - \$(EPROSIMARTPSHOME)\include;\$(LIB_BOOST_PATH);%(AdditionalIncludeDirectories) + \$(fastrtpsHOME)\include;\$(LIB_BOOST_PATH);%(AdditionalIncludeDirectories) _WIN32_WINDOWS;WIN32;EPROSIMA_WIN32;$if(it.dll)$EPROSIMA_ALL_DYN_LINK;$endif$BOOST_ALL_DYN_LINK;$if(it.debug)$_DEBUG;$else$NDEBUG;$endif$ NotUsing diff --git a/rtpsgen/src/com/eprosima/rtps/rtpsgen.java b/rtpsgen/src/com/eprosima/rtps/rtpsgen.java index c0ba45033f4..d2618036cfb 100644 --- a/rtpsgen/src/com/eprosima/rtps/rtpsgen.java +++ b/rtpsgen/src/com/eprosima/rtps/rtpsgen.java @@ -52,7 +52,7 @@ public class rtpsgen { private static ArrayList m_platforms = null; private Vector m_idlFiles; - protected static String m_appEnv = "EPROSIMARTPSHOME"; + protected static String m_appEnv = "fastrtpsHOME"; private String m_exampleOption = null; private String m_languageOption = "C++"; private boolean m_ppDisable = false; //TODO @@ -65,7 +65,7 @@ public class rtpsgen { private boolean m_publishercode = true; private boolean m_subscribercode = true; - protected static String m_localAppProduct = "eprosimartps"; + protected static String m_localAppProduct = "fastrtps"; private ArrayList m_includePaths = new ArrayList(); private String m_command = null; @@ -239,7 +239,7 @@ public boolean execute() { } // Add product library - solution.addLibrary("eprosimartps"); + solution.addLibrary("fastrtps"); for (int count = 0; returnedValue && (count < m_idlFiles.size()); ++count) { Project project = process(m_idlFiles.get(count)); @@ -306,7 +306,7 @@ private String getVersion() { //InputStream input = this.getClass().getResourceAsStream("/rtps_version.h"); - InputStream input = this.getClass().getClassLoader().getResourceAsStream("eprosimartps_version.h"); + InputStream input = this.getClass().getClassLoader().getResourceAsStream("fastrtps_version.h"); byte[] b = new byte[input.available()]; input.read(b); String text = new String(b); diff --git a/rtpsgen/src/com/eprosima/rtps/solution/Solution.java b/rtpsgen/src/com/eprosima/rtps/solution/Solution.java index 4fe55d3ca82..f2a5da54eb6 100644 --- a/rtpsgen/src/com/eprosima/rtps/solution/Solution.java +++ b/rtpsgen/src/com/eprosima/rtps/solution/Solution.java @@ -32,7 +32,7 @@ public ArrayList getLibraries() for(int count = 0; count < libraries.size(); ++count) { - if(m_example.contains("Win") && libraries.get(count).startsWith("eprosimartps")) + if(m_example.contains("Win") && libraries.get(count).startsWith("fastrtps")) ret.add(libraries.get(count) + "-" + m_version); else ret.add(libraries.get(count)); @@ -48,7 +48,7 @@ public ArrayList getLibrariesDebug() for(int count = 0; count < libraries.size(); ++count) { - if(m_example.contains("Win") && libraries.get(count).startsWith("eprosimartps")) + if(m_example.contains("Win") && libraries.get(count).startsWith("fastrtps")) ret.add(libraries.get(count) + "d-" + m_version); else ret.add(libraries.get(count) + "d"); @@ -66,7 +66,7 @@ public ArrayList getLibrariesStatic() { if(libraries.get(count).startsWith("ndds")) ret.add(libraries.get(count) + "z"); - else if(m_example.contains("Win") && libraries.get(count).startsWith("eprosimartps")) + else if(m_example.contains("Win") && libraries.get(count).startsWith("fastrtps")) ret.add("lib" + libraries.get(count) + "-" + m_version); else ret.add("lib" + libraries.get(count)); @@ -84,7 +84,7 @@ public ArrayList getLibrariesStaticDebug() { if(libraries.get(count).startsWith("ndds")) ret.add(libraries.get(count) + "zd"); - else if(m_example.contains("Win") && libraries.get(count).startsWith("eprosimartps")) + else if(m_example.contains("Win") && libraries.get(count).startsWith("fastrtps")) ret.add("lib" + libraries.get(count) + "d-" + m_version); else ret.add("lib" + libraries.get(count) + "d"); diff --git a/src/cpp/pubsub/PUBSUBDomain.cpp b/src/cpp/pubsub/PUBSUBDomain.cpp index 09d2133e10b..02505d33561 100644 --- a/src/cpp/pubsub/PUBSUBDomain.cpp +++ b/src/cpp/pubsub/PUBSUBDomain.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,13 +11,13 @@ * */ -#include "eprosimartps/pubsub/PUBSUBDomain.h" -#include "eprosimartps/rtps/RTPSDomain.h" +#include "fastrtps/pubsub/PUBSUBDomain.h" +#include "fastrtps/rtps/RTPSDomain.h" -#include "eprosimartps/pubsub/participant/PUBSUBParticipant.h" -#include "eprosimartps/pubsub/participant/PUBSUBParticipantImpl.h" +#include "fastrtps/pubsub/participant/PUBSUBParticipant.h" +#include "fastrtps/pubsub/participant/PUBSUBParticipantImpl.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" using namespace eprosima::rtps; diff --git a/src/cpp/pubsub/PUBSUBDomain_old.cpp b/src/cpp/pubsub/PUBSUBDomain_old.cpp index d5615a19015..ac51ca5fe1a 100644 --- a/src/cpp/pubsub/PUBSUBDomain_old.cpp +++ b/src/cpp/pubsub/PUBSUBDomain_old.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,21 +11,21 @@ * */ -#include "eprosimartps/pubsub/RTPSDomain.h" -#include "eprosimartps/pubsub/TopicDataType.h" -#include "eprosimartps/pubsub/SubscriberListener.h" -#include "eprosimartps/pubsub/PublisherListener.h" -#include "eprosimartps/writer/StatelessWriter.h" -#include "eprosimartps/reader/StatelessReader.h" -#include "eprosimartps/reader/StatefulReader.h" -#include "eprosimartps/writer/StatefulWriter.h" -#include "eprosimartps/pubsub/Publisher.h" -#include "eprosimartps/pubsub/Subscriber.h" -#include "eprosimartps/RTPSParticipant.h" - -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/utils/eClock.h" -#include "eprosimartps/utils/IPFinder.h" +#include "fastrtps/pubsub/RTPSDomain.h" +#include "fastrtps/pubsub/TopicDataType.h" +#include "fastrtps/pubsub/SubscriberListener.h" +#include "fastrtps/pubsub/PublisherListener.h" +#include "fastrtps/writer/StatelessWriter.h" +#include "fastrtps/reader/StatelessReader.h" +#include "fastrtps/reader/StatefulReader.h" +#include "fastrtps/writer/StatefulWriter.h" +#include "fastrtps/pubsub/Publisher.h" +#include "fastrtps/pubsub/Subscriber.h" +#include "fastrtps/RTPSParticipant.h" + +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/utils/eClock.h" +#include "fastrtps/utils/IPFinder.h" #include #include diff --git a/src/cpp/pubsub/participant/PUBSUBParticipant.cpp b/src/cpp/pubsub/participant/PUBSUBParticipant.cpp index 73c68935f9f..b9bf902da26 100644 --- a/src/cpp/pubsub/participant/PUBSUBParticipant.cpp +++ b/src/cpp/pubsub/participant/PUBSUBParticipant.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,9 +11,9 @@ * */ -#include "eprosimartps/pubsub/participant/PUBSUBParticipant.h" +#include "fastrtps/pubsub/participant/PUBSUBParticipant.h" -#include "eprosimartps/pubsub/participant/PUBSUBParticipantImpl.h" +#include "fastrtps/pubsub/participant/PUBSUBParticipantImpl.h" namespace eprosima { namespace pubsub { diff --git a/src/cpp/pubsub/participant/PUBSUBParticipantImpl.cpp b/src/cpp/pubsub/participant/PUBSUBParticipantImpl.cpp index dec2c7c3258..cb8d61e5d5c 100644 --- a/src/cpp/pubsub/participant/PUBSUBParticipantImpl.cpp +++ b/src/cpp/pubsub/participant/PUBSUBParticipantImpl.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,21 +11,21 @@ * */ -#include "eprosimartps/pubsub/participant/PUBSUBParticipantImpl.h" -#include "eprosimartps/pubsub/participant/PUBSUBParticipant.h" +#include "fastrtps/pubsub/participant/PUBSUBParticipantImpl.h" +#include "fastrtps/pubsub/participant/PUBSUBParticipant.h" -#include "eprosimartps/pubsub/TopicDataType.h" +#include "fastrtps/pubsub/TopicDataType.h" -#include "eprosimartps/rtps/participant/RTPSParticipant.h" +#include "fastrtps/rtps/participant/RTPSParticipant.h" -#include "eprosimartps/pubsub/attributes/PublisherAttributes.h" -#include "eprosimartps/pubsub/publisher/PublisherImpl.h" -#include "eprosimartps/pubsub/publisher/Publisher.h" +#include "fastrtps/pubsub/attributes/PublisherAttributes.h" +#include "fastrtps/pubsub/publisher/PublisherImpl.h" +#include "fastrtps/pubsub/publisher/Publisher.h" -#include "eprosimartps/rtps/RTPSDomain.h" +#include "fastrtps/rtps/RTPSDomain.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" namespace eprosima { namespace pubsub { diff --git a/src/cpp/pubsub/publisher/Publisher.cpp b/src/cpp/pubsub/publisher/Publisher.cpp index 2daf2633f63..162b07e5d11 100644 --- a/src/cpp/pubsub/publisher/Publisher.cpp +++ b/src/cpp/pubsub/publisher/Publisher.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,10 +11,10 @@ * */ -#include "eprosimartps/pubsub/publisher/Publisher.h" -#include "eprosimartps/pubsub/publisher/PublisherImpl.h" +#include "fastrtps/pubsub/publisher/Publisher.h" +#include "fastrtps/pubsub/publisher/PublisherImpl.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" namespace eprosima { namespace pubsub { diff --git a/src/cpp/pubsub/publisher/PublisherHistory.cpp b/src/cpp/pubsub/publisher/PublisherHistory.cpp index c92e0e412af..ceddda409f9 100644 --- a/src/cpp/pubsub/publisher/PublisherHistory.cpp +++ b/src/cpp/pubsub/publisher/PublisherHistory.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,13 +11,13 @@ * */ -#include "eprosimartps/pubsub/publisher/PublisherHistory.h" +#include "fastrtps/pubsub/publisher/PublisherHistory.h" -#include "eprosimartps/pubsub/publisher/PublisherImpl.h" +#include "fastrtps/pubsub/publisher/PublisherImpl.h" -#include "eprosimartps/rtps/writer/RTPSWriter.h" +#include "fastrtps/rtps/writer/RTPSWriter.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" static const char* const CLASS_NAME = "PublisherHistory"; diff --git a/src/cpp/pubsub/publisher/PublisherImpl.cpp b/src/cpp/pubsub/publisher/PublisherImpl.cpp index 93afeb9745b..0df8b12c731 100644 --- a/src/cpp/pubsub/publisher/PublisherImpl.cpp +++ b/src/cpp/pubsub/publisher/PublisherImpl.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,16 +11,16 @@ * */ -#include "eprosimartps/pubsub/publisher/PublisherImpl.h" -#include "eprosimartps/pubsub/TopicDataType.h" -#include "eprosimartps/pubsub/publisher/PublisherListener.h" -#include "eprosimartps/rtps/writer/RTPSWriter.h" +#include "fastrtps/pubsub/publisher/PublisherImpl.h" +#include "fastrtps/pubsub/TopicDataType.h" +#include "fastrtps/pubsub/publisher/PublisherListener.h" +#include "fastrtps/rtps/writer/RTPSWriter.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" -//#include "eprosimartps/RTPSParticipant.h" +//#include "fastrtps/RTPSParticipant.h" namespace eprosima { namespace pubsub { diff --git a/src/cpp/pubsub/qos/ParameterList.cpp b/src/cpp/pubsub/qos/ParameterList.cpp index 4c506c3cb7e..7e099d47259 100644 --- a/src/cpp/pubsub/qos/ParameterList.cpp +++ b/src/cpp/pubsub/qos/ParameterList.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,8 +11,8 @@ * */ -#include "eprosimartps/qos/ParameterList.h" -#include "eprosimartps/qos/QosPolicies.h" +#include "fastrtps/qos/ParameterList.h" +#include "fastrtps/qos/QosPolicies.h" namespace eprosima { diff --git a/src/cpp/pubsub/qos/ParameterTypes.cpp b/src/cpp/pubsub/qos/ParameterTypes.cpp index 75e7238ca6b..11533ddcc0a 100644 --- a/src/cpp/pubsub/qos/ParameterTypes.cpp +++ b/src/cpp/pubsub/qos/ParameterTypes.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,9 +11,9 @@ * */ -#include "eprosimartps/qos/ParameterTypes.h" +#include "fastrtps/qos/ParameterTypes.h" -#include "eprosimartps/CDRMessage.h" +#include "fastrtps/CDRMessage.h" namespace eprosima { namespace pubsub { diff --git a/src/cpp/pubsub/qos/QosList.cpp b/src/cpp/pubsub/qos/QosList.cpp index 49d4383c242..17eeccb8cd0 100644 --- a/src/cpp/pubsub/qos/QosList.cpp +++ b/src/cpp/pubsub/qos/QosList.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,9 +11,9 @@ * */ -#include "eprosimartps/qos/QosList.h" +#include "fastrtps/qos/QosList.h" -#include "eprosimartps/qos/QosPolicies.h" +#include "fastrtps/qos/QosPolicies.h" namespace eprosima { namespace pubsub { diff --git a/src/cpp/pubsub/qos/QosPolicies.cpp b/src/cpp/pubsub/qos/QosPolicies.cpp index 94f91aeeb25..7ec24a031ac 100644 --- a/src/cpp/pubsub/qos/QosPolicies.cpp +++ b/src/cpp/pubsub/qos/QosPolicies.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,10 +11,10 @@ * */ -#include "eprosimartps/qos/QosPolicies.h" +#include "fastrtps/qos/QosPolicies.h" -#include "eprosimartps/CDRMessage.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/CDRMessage.h" +#include "fastrtps/utils/RTPSLog.h" namespace eprosima { namespace pubsub { diff --git a/src/cpp/pubsub/qos/ReaderQos.cpp b/src/cpp/pubsub/qos/ReaderQos.cpp index 555c0c03714..5cfe1c814e1 100644 --- a/src/cpp/pubsub/qos/ReaderQos.cpp +++ b/src/cpp/pubsub/qos/ReaderQos.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,8 +11,8 @@ * */ -#include "eprosimartps/qos/ReaderQos.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/qos/ReaderQos.h" +#include "fastrtps/utils/RTPSLog.h" namespace eprosima { namespace pubsub { diff --git a/src/cpp/pubsub/qos/WriterQos.cpp b/src/cpp/pubsub/qos/WriterQos.cpp index f1665dfa299..dc3ae88e7cc 100644 --- a/src/cpp/pubsub/qos/WriterQos.cpp +++ b/src/cpp/pubsub/qos/WriterQos.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,8 +11,8 @@ * */ -#include "eprosimartps/pubsub/qos/WriterQos.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/pubsub/qos/WriterQos.h" +#include "fastrtps/utils/RTPSLog.h" namespace eprosima { namespace pubsub { diff --git a/src/cpp/pubsub/subscriber/Subscriber.cpp b/src/cpp/pubsub/subscriber/Subscriber.cpp index e8932c2738e..d171c723c53 100644 --- a/src/cpp/pubsub/subscriber/Subscriber.cpp +++ b/src/cpp/pubsub/subscriber/Subscriber.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,19 +11,19 @@ * */ -#include "eprosimartps/pubsub/Subscriber.h" -#include "eprosimartps/reader/RTPSReader.h" -#include "eprosimartps/reader/StatefulReader.h" -#include "eprosimartps/reader/WriterProxy.h" +#include "fastrtps/pubsub/Subscriber.h" +#include "fastrtps/reader/RTPSReader.h" +#include "fastrtps/reader/StatefulReader.h" +#include "fastrtps/reader/WriterProxy.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" -#include "eprosimartps/pubsub/TopicDataType.h" +#include "fastrtps/pubsub/TopicDataType.h" -#include "eprosimartps/pubsub/SubscriberListener.h" +#include "fastrtps/pubsub/SubscriberListener.h" -#include "eprosimartps/RTPSParticipant.h" +#include "fastrtps/RTPSParticipant.h" diff --git a/src/cpp/pubsub/subscriber/SubscriberListener.cpp b/src/cpp/pubsub/subscriber/SubscriberListener.cpp index 4333062cc25..59d1a8703cb 100644 --- a/src/cpp/pubsub/subscriber/SubscriberListener.cpp +++ b/src/cpp/pubsub/subscriber/SubscriberListener.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,7 +11,7 @@ * */ -#include "eprosimartps/pubsub/SubscriberListener.h" +#include "fastrtps/pubsub/SubscriberListener.h" namespace eprosima{ namespace pubsub{ diff --git a/src/cpp/rtps/Endpoint.cpp b/src/cpp/rtps/Endpoint.cpp index d4d398f2c3c..542dc44aa15 100644 --- a/src/cpp/rtps/Endpoint.cpp +++ b/src/cpp/rtps/Endpoint.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,11 +11,12 @@ * */ -#include "eprosimartps/rtps/Endpoint.h" +#include "fastrtps/rtps/Endpoint.h" #include namespace eprosima { +namespace fastrtps{ namespace rtps { Endpoint::Endpoint(RTPSParticipantImpl* pimpl,GUID_t& guid,EndpointAttributes& att): @@ -33,3 +34,4 @@ Endpoint::~Endpoint() { } /* namespace rtps */ } /* namespace eprosima */ +} diff --git a/src/cpp/rtps/RTPSDomain.cpp b/src/cpp/rtps/RTPSDomain.cpp index 4dd521995ec..371390fb326 100644 --- a/src/cpp/rtps/RTPSDomain.cpp +++ b/src/cpp/rtps/RTPSDomain.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,21 +11,22 @@ * */ -#include "eprosimartps/rtps/RTPSDomain.h" +#include "fastrtps/rtps/RTPSDomain.h" -#include "eprosimartps/rtps/participant/RTPSParticipant.h" -#include "eprosimartps/rtps/participant/RTPSParticipantImpl.h" +#include "fastrtps/rtps/participant/RTPSParticipant.h" +#include "fastrtps/rtps/participant/RTPSParticipantImpl.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" -#include "eprosimartps/utils/eClock.h" -#include "eprosimartps/utils/IPFinder.h" +#include "fastrtps/utils/eClock.h" +#include "fastrtps/utils/IPFinder.h" -#include "eprosimartps/rtps/writer/RTPSWriter.h" -#include "eprosimartps/rtps/writer/RTPSReader.h" +#include "fastrtps/rtps/writer/RTPSWriter.h" +#include "fastrtps/rtps/writer/RTPSReader.h" namespace eprosima { +namespace fastrtps{ namespace rtps { static const char* const CLASS_NAME = "DomainRTPSParticipant"; @@ -72,7 +73,6 @@ const char* const METHOD_NAME = "~RTPSDomain"; void RTPSDomain::stopAll() { - //delete(PubSubDomain::getInstance()); delete(getInstance()); } @@ -221,8 +221,9 @@ bool RTPSDomain::removeRTPSReader(RTPSReader* reader) } - -} /* namespace pubsub */ +} +} /* namespace */ } /* namespace eprosima */ +} diff --git a/src/cpp/rtps/builtin/BuiltinProtocols.cpp b/src/cpp/rtps/builtin/BuiltinProtocols.cpp index e8a62b3b6f5..36e83c93c39 100644 --- a/src/cpp/rtps/builtin/BuiltinProtocols.cpp +++ b/src/cpp/rtps/builtin/BuiltinProtocols.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,20 +11,20 @@ * */ -#include "eprosimartps/rtps/builtin/BuiltinProtocols.h" -#include "eprosimartps/rtps/common/Locator.h" +#include "fastrtps/rtps/builtin/BuiltinProtocols.h" +#include "fastrtps/rtps/common/Locator.h" -#include "eprosimartps/rtps/builtin/discovery/participant/PDPSimple.h" -#include "eprosimartps/rtps/builtin/discovery/endpoint/EDP.h" +#include "fastrtps/rtps/builtin/discovery/participant/PDPSimple.h" +#include "fastrtps/rtps/builtin/discovery/endpoint/EDP.h" -#include "eprosimartps/rtps/builtin/liveliness/WLP.h" +#include "fastrtps/rtps/builtin/liveliness/WLP.h" -//#include "eprosimartps/reader/StatelessReader.h" +//#include "fastrtps/reader/StatelessReader.h" -//#include "eprosimartps/pubsub/RTPSDomain.h" +//#include "fastrtps/pubsub/RTPSDomain.h" -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/utils/IPFinder.h" +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/utils/IPFinder.h" namespace eprosima { namespace rtps { diff --git a/src/cpp/rtps/builtin/ParticipantProxyData.cpp b/src/cpp/rtps/builtin/ParticipantProxyData.cpp index 22541082f0c..fe1dcd94a25 100644 --- a/src/cpp/rtps/builtin/ParticipantProxyData.cpp +++ b/src/cpp/rtps/builtin/ParticipantProxyData.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,11 +11,11 @@ * */ -#include "eprosimartps/RTPSParticipantProxyData.h" -#include "eprosimartps/builtin/discovery/RTPSParticipant/PDPSimple.h" -#include "eprosimartps/RTPSParticipant.h" -#include "eprosimartps/builtin/discovery/RTPSParticipant/timedevent/RemoteRTPSParticipantLeaseDuration.h" -#include "eprosimartps/builtin/BuiltinProtocols.h" +#include "fastrtps/RTPSParticipantProxyData.h" +#include "fastrtps/builtin/discovery/RTPSParticipant/PDPSimple.h" +#include "fastrtps/RTPSParticipant.h" +#include "fastrtps/builtin/discovery/RTPSParticipant/timedevent/RemoteRTPSParticipantLeaseDuration.h" +#include "fastrtps/builtin/BuiltinProtocols.h" namespace eprosima { namespace rtps { diff --git a/src/cpp/rtps/builtin/ReaderProxyData.cpp b/src/cpp/rtps/builtin/ReaderProxyData.cpp index c53ede3195d..c8ce01f8164 100644 --- a/src/cpp/rtps/builtin/ReaderProxyData.cpp +++ b/src/cpp/rtps/builtin/ReaderProxyData.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,11 +11,11 @@ * */ -#include "eprosimartps/writer/ReaderProxyData.h" +#include "fastrtps/writer/ReaderProxyData.h" -#include "eprosimartps/common/types/CDRMessage_t.h" +#include "fastrtps/common/types/CDRMessage_t.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" namespace eprosima { namespace rtps { diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp index 0ed207ba271..a513429746a 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,28 +11,28 @@ * */ -#include "eprosimartps/builtin/discovery/endpoint/EDP.h" +#include "fastrtps/builtin/discovery/endpoint/EDP.h" -#include "eprosimartps/builtin/discovery/RTPSParticipant/PDPSimple.h" +#include "fastrtps/builtin/discovery/RTPSParticipant/PDPSimple.h" -#include "eprosimartps/RTPSParticipant.h" -#include "eprosimartps/RTPSParticipantProxyData.h" +#include "fastrtps/RTPSParticipant.h" +#include "fastrtps/RTPSParticipantProxyData.h" -#include "eprosimartps/writer/StatefulWriter.h" -#include "eprosimartps/reader/StatefulReader.h" -#include "eprosimartps/writer/StatelessWriter.h" -#include "eprosimartps/reader/StatelessReader.h" +#include "fastrtps/writer/StatefulWriter.h" +#include "fastrtps/reader/StatefulReader.h" +#include "fastrtps/writer/StatelessWriter.h" +#include "fastrtps/reader/StatelessReader.h" -#include "eprosimartps/reader/WriterProxyData.h" -#include "eprosimartps/writer/ReaderProxyData.h" +#include "fastrtps/reader/WriterProxyData.h" +#include "fastrtps/writer/ReaderProxyData.h" -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/utils/IPFinder.h" -#include "eprosimartps/utils/StringMatching.h" +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/utils/IPFinder.h" +#include "fastrtps/utils/StringMatching.h" -#include "eprosimartps/pubsub/PublisherListener.h" -#include "eprosimartps/pubsub/SubscriberListener.h" +#include "fastrtps/pubsub/PublisherListener.h" +#include "fastrtps/pubsub/SubscriberListener.h" using namespace eprosima::pubsub; diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp index a703957be8e..67d672e821b 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,23 +11,23 @@ * */ -#include "eprosimartps/builtin/discovery/endpoint/EDPSimple.h" +#include "fastrtps/builtin/discovery/endpoint/EDPSimple.h" -#include "eprosimartps/builtin/discovery/RTPSParticipant/PDPSimple.h" +#include "fastrtps/builtin/discovery/RTPSParticipant/PDPSimple.h" -#include "eprosimartps/RTPSParticipant.h" -#include "eprosimartps/RTPSParticipantProxyData.h" +#include "fastrtps/RTPSParticipant.h" +#include "fastrtps/RTPSParticipantProxyData.h" -#include "eprosimartps/writer/StatefulWriter.h" -#include "eprosimartps/reader/StatefulReader.h" -#include "eprosimartps/writer/StatelessWriter.h" -#include "eprosimartps/reader/StatelessReader.h" +#include "fastrtps/writer/StatefulWriter.h" +#include "fastrtps/reader/StatefulReader.h" +#include "fastrtps/writer/StatelessWriter.h" +#include "fastrtps/reader/StatelessReader.h" -#include "eprosimartps/reader/WriterProxyData.h" -#include "eprosimartps/writer/ReaderProxyData.h" +#include "fastrtps/reader/WriterProxyData.h" +#include "fastrtps/writer/ReaderProxyData.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" namespace eprosima { namespace rtps { diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp index 1838a522248..98150c59810 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,14 +11,14 @@ * */ -#include "eprosimartps/builtin/discovery/endpoint/EDPSimpleListeners.h" +#include "fastrtps/builtin/discovery/endpoint/EDPSimpleListeners.h" -#include "eprosimartps/builtin/discovery/endpoint/EDPSimple.h" -#include "eprosimartps/builtin/discovery/RTPSParticipant/PDPSimple.h" -#include "eprosimartps/RTPSParticipant.h" -#include "eprosimartps/reader/StatefulReader.h" -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/common/types/InstanceHandle.h" +#include "fastrtps/builtin/discovery/endpoint/EDPSimple.h" +#include "fastrtps/builtin/discovery/RTPSParticipant/PDPSimple.h" +#include "fastrtps/RTPSParticipant.h" +#include "fastrtps/reader/StatefulReader.h" +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/common/types/InstanceHandle.h" namespace eprosima { diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleTopicDataType.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleTopicDataType.cpp index d8abb5c9ecf..f68ffa0f7e4 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleTopicDataType.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleTopicDataType.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,10 +11,10 @@ * */ -#include "eprosimartps/builtin/discovery/endpoint/EDPSimpleTopicDataType.h" +#include "fastrtps/builtin/discovery/endpoint/EDPSimpleTopicDataType.h" -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/qos/ParameterList.h" +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/qos/ParameterList.h" namespace eprosima { namespace rtps { diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp index b7c3fd6a09e..b3435ccb0fb 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,16 +11,16 @@ * */ -#include "eprosimartps/builtin/discovery/endpoint/EDPStatic.h" -#include "eprosimartps/builtin/discovery/RTPSParticipant/PDPSimple.h" +#include "fastrtps/builtin/discovery/endpoint/EDPStatic.h" +#include "fastrtps/builtin/discovery/RTPSParticipant/PDPSimple.h" -#include "eprosimartps/reader/WriterProxyData.h" -#include "eprosimartps/writer/ReaderProxyData.h" +#include "fastrtps/reader/WriterProxyData.h" +#include "fastrtps/writer/ReaderProxyData.h" -#include "eprosimartps/reader/RTPSReader.h" -#include "eprosimartps/writer/RTPSWriter.h" +#include "fastrtps/reader/RTPSReader.h" +#include "fastrtps/writer/RTPSWriter.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" #include diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPStaticXML.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPStaticXML.cpp index ec240966591..ef39404b252 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPStaticXML.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPStaticXML.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,12 +11,12 @@ * */ -#include "eprosimartps/builtin/discovery/endpoint/EDPStaticXML.h" +#include "fastrtps/builtin/discovery/endpoint/EDPStaticXML.h" -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/utils/TimeConversion.h" -#include "eprosimartps/reader/WriterProxyData.h" -#include "eprosimartps/writer/ReaderProxyData.h" +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/utils/TimeConversion.h" +#include "fastrtps/reader/WriterProxyData.h" +#include "fastrtps/writer/ReaderProxyData.h" #include "boost/lexical_cast.hpp" diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp index 9be1ccfb981..d0d755a6a29 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,26 +11,26 @@ * */ -#include "eprosimartps/rtps/builtin/discovery/participant/PDPSimple.h" +#include "fastrtps/rtps/builtin/discovery/participant/PDPSimple.h" -#include "eprosimartps/rtps/builtin/BuiltinProtocols.h" -#include "eprosimartps/rtps/builtin/liveliness/WLP.h" +#include "fastrtps/rtps/builtin/BuiltinProtocols.h" +#include "fastrtps/rtps/builtin/liveliness/WLP.h" -//#include "eprosimartps/pubsub/RTPSDomain.h" +//#include "fastrtps/pubsub/RTPSDomain.h" -#include "eprosimartps/RTPSParticipant.h" -#include "eprosimartps/RTPSParticipantProxyData.h" -#include "eprosimartps/writer/StatelessWriter.h" -#include "eprosimartps/reader/StatelessReader.h" +#include "fastrtps/RTPSParticipant.h" +#include "fastrtps/RTPSParticipantProxyData.h" +#include "fastrtps/writer/StatelessWriter.h" +#include "fastrtps/reader/StatelessReader.h" -#include "eprosimartps/builtin/discovery/endpoint/EDPSimple.h" -#include "eprosimartps/builtin/discovery/endpoint/EDPStatic.h" -#include "eprosimartps/builtin/discovery/RTPSParticipant/timedevent/ResendRTPSParticipantProxyDataPeriod.h" +#include "fastrtps/builtin/discovery/endpoint/EDPSimple.h" +#include "fastrtps/builtin/discovery/endpoint/EDPStatic.h" +#include "fastrtps/builtin/discovery/RTPSParticipant/timedevent/ResendRTPSParticipantProxyDataPeriod.h" -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/utils/eClock.h" -#include "eprosimartps/utils/TimeConversion.h" +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/utils/eClock.h" +#include "fastrtps/utils/TimeConversion.h" using namespace eprosima::pubsub; diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimpleListener.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimpleListener.cpp index 52db20513c5..195c8b5d738 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPSimpleListener.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimpleListener.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,23 +11,23 @@ * */ -#include "eprosimartps/builtin/discovery/RTPSParticipant/PDPSimpleListener.h" +#include "fastrtps/builtin/discovery/RTPSParticipant/PDPSimpleListener.h" -#include "eprosimartps/builtin/discovery/RTPSParticipant/timedevent/RemoteRTPSParticipantLeaseDuration.h" +#include "fastrtps/builtin/discovery/RTPSParticipant/timedevent/RemoteRTPSParticipantLeaseDuration.h" -#include "eprosimartps/builtin/discovery/RTPSParticipant/PDPSimple.h" +#include "fastrtps/builtin/discovery/RTPSParticipant/PDPSimple.h" -#include "eprosimartps/builtin/discovery/endpoint/EDP.h" -#include "eprosimartps/RTPSParticipant.h" -#include "eprosimartps/reader/StatelessReader.h" -#include "eprosimartps/writer/StatelessWriter.h" +#include "fastrtps/builtin/discovery/endpoint/EDP.h" +#include "fastrtps/RTPSParticipant.h" +#include "fastrtps/reader/StatelessReader.h" +#include "fastrtps/writer/StatelessWriter.h" -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/utils/eClock.h" -#include "eprosimartps/utils/TimeConversion.h" +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/utils/eClock.h" +#include "fastrtps/utils/TimeConversion.h" -#include "eprosimartps/pubsub/RTPSParticipantDiscoveryInfo.h" -#include "eprosimartps/pubsub/RTPSParticipantListener.h" +#include "fastrtps/pubsub/RTPSParticipantDiscoveryInfo.h" +#include "fastrtps/pubsub/RTPSParticipantListener.h" namespace eprosima { namespace rtps { diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimpleTopicDataType.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimpleTopicDataType.cpp index eeaad3d83c6..689b833c03d 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPSimpleTopicDataType.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimpleTopicDataType.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,9 +11,9 @@ * */ -#include "eprosimartps/builtin/discovery/RTPSParticipant/PDPSimpleTopicDataType.h" -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/qos/ParameterList.h" +#include "fastrtps/builtin/discovery/RTPSParticipant/PDPSimpleTopicDataType.h" +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/qos/ParameterList.h" namespace eprosima { namespace rtps { diff --git a/src/cpp/rtps/builtin/discovery/participant/timedevent/RemoteParticipantLeaseDuration.cpp b/src/cpp/rtps/builtin/discovery/participant/timedevent/RemoteParticipantLeaseDuration.cpp index 792148ebbb5..e77d05563c7 100644 --- a/src/cpp/rtps/builtin/discovery/participant/timedevent/RemoteParticipantLeaseDuration.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/timedevent/RemoteParticipantLeaseDuration.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,11 +11,11 @@ * */ -#include "eprosimartps/builtin/discovery/RTPSParticipant/timedevent/RemoteRTPSParticipantLeaseDuration.h" -#include "eprosimartps/resources/ResourceEvent.h" -#include "eprosimartps/builtin/discovery/RTPSParticipant/PDPSimple.h" -#include "eprosimartps/RTPSParticipantProxyData.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/builtin/discovery/RTPSParticipant/timedevent/RemoteRTPSParticipantLeaseDuration.h" +#include "fastrtps/resources/ResourceEvent.h" +#include "fastrtps/builtin/discovery/RTPSParticipant/PDPSimple.h" +#include "fastrtps/RTPSParticipantProxyData.h" +#include "fastrtps/utils/RTPSLog.h" #include diff --git a/src/cpp/rtps/builtin/discovery/participant/timedevent/ResendParticipantProxyDataPeriod.cpp b/src/cpp/rtps/builtin/discovery/participant/timedevent/ResendParticipantProxyDataPeriod.cpp index a211d700b25..7abd4fa1868 100644 --- a/src/cpp/rtps/builtin/discovery/participant/timedevent/ResendParticipantProxyDataPeriod.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/timedevent/ResendParticipantProxyDataPeriod.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,15 +11,15 @@ * */ -#include "eprosimartps/builtin/discovery/RTPSParticipant/timedevent/ResendRTPSParticipantProxyDataPeriod.h" -#include "eprosimartps/builtin/discovery/RTPSParticipant/PDPSimple.h" +#include "fastrtps/builtin/discovery/RTPSParticipant/timedevent/ResendRTPSParticipantProxyDataPeriod.h" +#include "fastrtps/builtin/discovery/RTPSParticipant/PDPSimple.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" -//#include "eprosimartps/resources/ResourceSend.h" -#include "eprosimartps/resources/ResourceEvent.h" +//#include "fastrtps/resources/ResourceSend.h" +#include "fastrtps/resources/ResourceEvent.h" -//#include "eprosimartps/RTPSMessageCreator.h" +//#include "fastrtps/RTPSMessageCreator.h" #include namespace eprosima { namespace rtps { diff --git a/src/cpp/rtps/builtin/liveliness/WLP.cpp b/src/cpp/rtps/builtin/liveliness/WLP.cpp index 6744417fada..abdf6454137 100644 --- a/src/cpp/rtps/builtin/liveliness/WLP.cpp +++ b/src/cpp/rtps/builtin/liveliness/WLP.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -12,19 +12,19 @@ */ #include -#include "eprosimartps/builtin/liveliness/WLP.h" -#include "eprosimartps/common/types/Guid.h" -#include "eprosimartps/RTPSParticipant.h" -#include "eprosimartps/writer/StatefulWriter.h" -#include "eprosimartps/reader/StatefulReader.h" -#include "eprosimartps/reader/WriterProxy.h" +#include "fastrtps/builtin/liveliness/WLP.h" +#include "fastrtps/common/types/Guid.h" +#include "fastrtps/RTPSParticipant.h" +#include "fastrtps/writer/StatefulWriter.h" +#include "fastrtps/reader/StatefulReader.h" +#include "fastrtps/reader/WriterProxy.h" -#include "eprosimartps/builtin/liveliness/timedevent/WLivelinessPeriodicAssertion.h" -#include "eprosimartps/builtin/BuiltinProtocols.h" -#include "eprosimartps/RTPSParticipantProxyData.h" +#include "fastrtps/builtin/liveliness/timedevent/WLivelinessPeriodicAssertion.h" +#include "fastrtps/builtin/BuiltinProtocols.h" +#include "fastrtps/RTPSParticipantProxyData.h" -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/utils/TimeConversion.h" +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/utils/TimeConversion.h" namespace eprosima { namespace rtps { diff --git a/src/cpp/rtps/builtin/liveliness/WLPListener.cpp b/src/cpp/rtps/builtin/liveliness/WLPListener.cpp index d0383f68a11..6fef045d43c 100644 --- a/src/cpp/rtps/builtin/liveliness/WLPListener.cpp +++ b/src/cpp/rtps/builtin/liveliness/WLPListener.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,18 +11,18 @@ * */ -#include "eprosimartps/builtin/liveliness/WLPListener.h" -#include "eprosimartps/builtin/liveliness/WLP.h" +#include "fastrtps/builtin/liveliness/WLPListener.h" +#include "fastrtps/builtin/liveliness/WLP.h" -#include "eprosimartps/builtin/discovery/RTPSParticipant/PDPSimple.h" +#include "fastrtps/builtin/discovery/RTPSParticipant/PDPSimple.h" -#include "eprosimartps/common/types/Guid.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/common/types/Guid.h" +#include "fastrtps/utils/RTPSLog.h" -#include "eprosimartps/RTPSParticipant.h" -#include "eprosimartps/reader/WriterProxyData.h" +#include "fastrtps/RTPSParticipant.h" +#include "fastrtps/reader/WriterProxyData.h" -#include "eprosimartps/reader/StatefulReader.h" +#include "fastrtps/reader/StatefulReader.h" namespace eprosima { namespace rtps { diff --git a/src/cpp/rtps/builtin/liveliness/WLPTopicDataType.cpp b/src/cpp/rtps/builtin/liveliness/WLPTopicDataType.cpp index b86a6635694..6c4c998c9eb 100644 --- a/src/cpp/rtps/builtin/liveliness/WLPTopicDataType.cpp +++ b/src/cpp/rtps/builtin/liveliness/WLPTopicDataType.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -12,9 +12,9 @@ */ -#include "eprosimartps/builtin/liveliness/WLPTopicDataType.h" -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/qos/ParameterList.h" +#include "fastrtps/builtin/liveliness/WLPTopicDataType.h" +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/qos/ParameterList.h" namespace eprosima { namespace rtps { diff --git a/src/cpp/rtps/builtin/liveliness/timedevent/WLivelinessPeriodicAssertion.cpp b/src/cpp/rtps/builtin/liveliness/timedevent/WLivelinessPeriodicAssertion.cpp index 32f8ab21ce3..105ffea8c09 100644 --- a/src/cpp/rtps/builtin/liveliness/timedevent/WLivelinessPeriodicAssertion.cpp +++ b/src/cpp/rtps/builtin/liveliness/timedevent/WLivelinessPeriodicAssertion.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,17 +11,17 @@ * */ -#include "eprosimartps/builtin/liveliness/timedevent/WLivelinessPeriodicAssertion.h" -#include "eprosimartps/builtin/liveliness/WLP.h" -#include "eprosimartps/RTPSParticipant.h" +#include "fastrtps/builtin/liveliness/timedevent/WLivelinessPeriodicAssertion.h" +#include "fastrtps/builtin/liveliness/WLP.h" +#include "fastrtps/RTPSParticipant.h" -#include "eprosimartps/reader/StatefulReader.h" -#include "eprosimartps/writer/StatefulWriter.h" +#include "fastrtps/reader/StatefulReader.h" +#include "fastrtps/writer/StatefulWriter.h" -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/utils/eClock.h" +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/utils/eClock.h" -#include "eprosimartps/builtin/discovery/RTPSParticipant/PDPSimple.h" +#include "fastrtps/builtin/discovery/RTPSParticipant/PDPSimple.h" namespace eprosima { namespace rtps { diff --git a/src/cpp/rtps/history/CacheChangePool.cpp b/src/cpp/rtps/history/CacheChangePool.cpp index 19010d9288b..6bf69683e6b 100644 --- a/src/cpp/rtps/history/CacheChangePool.cpp +++ b/src/cpp/rtps/history/CacheChangePool.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,11 +11,12 @@ * */ -#include "eprosimartps/rtps/history/CacheChangePool.h" -#include "eprosimartps/rtps/common/CacheChange.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/rtps/history/CacheChangePool.h" +#include "fastrtps/rtps/common/CacheChange.h" +#include "fastrtps/utils/RTPSLog.h" namespace eprosima { +namespace fastrtps{ namespace rtps { static const char* const CLASS_NAME = "CacheChangePool"; @@ -93,6 +94,6 @@ bool CacheChangePool::allocateGroup(uint16_t group_size) //logInfo(RTPS_UTILS,"Finish allocating CacheChange_t"); return added; } - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/history/History.cpp b/src/cpp/rtps/history/History.cpp index a155b399bc3..66d281b39f0 100644 --- a/src/cpp/rtps/history/History.cpp +++ b/src/cpp/rtps/history/History.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -12,17 +12,18 @@ */ -#include "eprosimartps/rtps/history/History.h" +#include "fastrtps/rtps/history/History.h" -#include "eprosimartps/rtps/common/CacheChange.h" +#include "fastrtps/rtps/common/CacheChange.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" #include #include namespace eprosima { +namespace fastrtps{ namespace rtps { static const char* const CLASS_NAME = "History"; @@ -131,13 +132,14 @@ bool History::get_max_change(CacheChange_t** max_change) } return false; } - +} } } #include namespace eprosima{ +namespace fastrtps{ namespace rtps{ void History::print_changes_seqNum2() @@ -153,6 +155,6 @@ void History::print_changes_seqNum2() } - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/history/ReaderHistory.cpp b/src/cpp/rtps/history/ReaderHistory.cpp index e88a7e65893..df179cded99 100644 --- a/src/cpp/rtps/history/ReaderHistory.cpp +++ b/src/cpp/rtps/history/ReaderHistory.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,14 +11,15 @@ * */ -#include "eprosimartps/rtps/history/ReaderHistory.h" +#include "fastrtps/rtps/history/ReaderHistory.h" -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/rtps/reader/RTPSReader.h" -#include "eprosimartps/rtps/reader/ReaderListener.h" +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/rtps/reader/RTPSReader.h" +#include "fastrtps/rtps/reader/ReaderListener.h" namespace eprosima { +namespace fastrtps{ namespace rtps { static const char* const CLASS_NAME = "ReaderHistory"; @@ -324,6 +325,6 @@ bool ReaderHistory::remove_change(CacheChange_t* a_change) // return false; //} - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/history/WriterHistory.cpp b/src/cpp/rtps/history/WriterHistory.cpp index 5dd238ea6ec..1bbea5a36c5 100644 --- a/src/cpp/rtps/history/WriterHistory.cpp +++ b/src/cpp/rtps/history/WriterHistory.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,10 +11,10 @@ * */ -#include "eprosimartps/rtps/history/WriterHistory.h" +#include "fastrtps/rtps/history/WriterHistory.h" -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/rtps/writer/RTPSWriter.h" +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/rtps/writer/RTPSWriter.h" #include #include diff --git a/src/cpp/rtps/messages/CDRMessagePool.cpp b/src/cpp/rtps/messages/CDRMessagePool.cpp index 602c16d563d..1cbbed986a7 100644 --- a/src/cpp/rtps/messages/CDRMessagePool.cpp +++ b/src/cpp/rtps/messages/CDRMessagePool.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,9 +11,10 @@ * */ -#include "eprosimartps/utils/CDRMessagePool.h" +#include "fastrtps/utils/CDRMessagePool.h" namespace eprosima { +namespace fastrtps{ namespace rtps { @@ -87,6 +88,6 @@ void CDRMessagePool::release_CDRMsg(CDRMessage_t& obj) { m_free_objects.push_back(&obj); } - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/messages/MessageReceiver.cpp b/src/cpp/rtps/messages/MessageReceiver.cpp index 6b2cd124445..e9683d667f3 100644 --- a/src/cpp/rtps/messages/MessageReceiver.cpp +++ b/src/cpp/rtps/messages/MessageReceiver.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,27 +11,28 @@ * */ -#include "eprosimartps/MessageReceiver.h" -#include "eprosimartps/common/RTPS_messages.h" -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/resources/ListenResource.h" +#include "fastrtps/MessageReceiver.h" +#include "fastrtps/common/RTPS_messages.h" +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/resources/ListenResource.h" -#include "eprosimartps/writer/StatefulWriter.h" -#include "eprosimartps/reader/StatefulReader.h" -#include "eprosimartps/writer/StatelessWriter.h" -#include "eprosimartps/reader/StatelessReader.h" +#include "fastrtps/writer/StatefulWriter.h" +#include "fastrtps/reader/StatefulReader.h" +#include "fastrtps/writer/StatelessWriter.h" +#include "fastrtps/reader/StatelessReader.h" -#include "eprosimartps/writer/ReaderProxyData.h" -#include "eprosimartps/reader/WriterProxyData.h" +#include "fastrtps/writer/ReaderProxyData.h" +#include "fastrtps/reader/WriterProxyData.h" -#include "eprosimartps/pubsub/SubscriberListener.h" +#include "fastrtps/pubsub/SubscriberListener.h" -#include "eprosimartps/RTPSParticipant.h" -#include "eprosimartps/builtin/discovery/RTPSParticipant/PDPSimple.h" +#include "fastrtps/RTPSParticipant.h" +#include "fastrtps/builtin/discovery/RTPSParticipant/PDPSimple.h" using namespace eprosima::pubsub; namespace eprosima { +namespace fastrtps{ namespace rtps { static const char* const CLASS_NAME = "MessageReceiver"; @@ -792,6 +793,6 @@ bool MessageReceiver::proc_Submsg_InfoSRC(CDRMessage_t* msg,SubmessageHeader_t* - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/messages/RTPSMessageCreator.cpp b/src/cpp/rtps/messages/RTPSMessageCreator.cpp index 76d6fb44cf5..63d1c7c6cba 100644 --- a/src/cpp/rtps/messages/RTPSMessageCreator.cpp +++ b/src/cpp/rtps/messages/RTPSMessageCreator.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,26 +11,27 @@ * */ -#include "eprosimartps/RTPSMessageCreator.h" -#include "eprosimartps/CDRMessage.h" -#include "eprosimartps/qos/ParameterList.h" -#include "eprosimartps/utils/eClock.h" -//#include "eprosimartps/utils/ObjectPool.h" -#include "eprosimartps/utils/CDRMessagePool.h" -#include "eprosimartps/common/RTPS_messages.h" +#include "fastrtps/RTPSMessageCreator.h" +#include "fastrtps/CDRMessage.h" +#include "fastrtps/qos/ParameterList.h" +#include "fastrtps/utils/eClock.h" +//#include "fastrtps/utils/ObjectPool.h" +#include "fastrtps/utils/CDRMessagePool.h" +#include "fastrtps/common/RTPS_messages.h" #include "boost/date_time/posix_time/posix_time.hpp" #include "boost/date_time/gregorian/gregorian.hpp" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" using namespace boost::posix_time; -using namespace eprosima::pubsub; +using namespace eprosima::fastrtps; namespace eprosima { +namespace fastrtps{ namespace rtps{ // Auxiliary message to avoid creation of new messages each time. @@ -180,7 +181,7 @@ bool RTPSMessageCreator::addSubmessageInfoTS_Now(CDRMessage_t* msg,bool invalida g_clock.setTimeNow(&time_now); return RTPSMessageCreator::addSubmessageInfoTS(msg,time_now,invalidateFlag); } - +} }; /* namespace rtps */ }; /* namespace eprosima */ diff --git a/src/cpp/rtps/messages/RTPSMessageGroup.cpp b/src/cpp/rtps/messages/RTPSMessageGroup.cpp index 9cadc1b14a7..5b9a6be68ae 100644 --- a/src/cpp/rtps/messages/RTPSMessageGroup.cpp +++ b/src/cpp/rtps/messages/RTPSMessageGroup.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,14 +11,15 @@ * */ -#include "eprosimartps/writer/RTPSMessageGroup.h" -#include "eprosimartps/RTPSMessageCreator.h" -#include "eprosimartps/writer/RTPSWriter.h" -#include "eprosimartps/resources/ResourceSend.h" +#include "fastrtps/writer/RTPSMessageGroup.h" +#include "fastrtps/RTPSMessageCreator.h" +#include "fastrtps/writer/RTPSWriter.h" +#include "fastrtps/resources/ResourceSend.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" namespace eprosima { +namespace fastrtps{ namespace rtps { static const char* const CLASS_NAME = "RTPSMessageGroup"; @@ -301,6 +302,6 @@ bool RTPSMessageGroup::send_Changes_AsData(RTPSMessageGroup_t* msg_group, - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/messages/submessages/AckNackMsg.hpp b/src/cpp/rtps/messages/submessages/AckNackMsg.hpp index 7de9194bef1..2141e668f25 100644 --- a/src/cpp/rtps/messages/submessages/AckNackMsg.hpp +++ b/src/cpp/rtps/messages/submessages/AckNackMsg.hpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,6 +13,7 @@ namespace eprosima{ +namespace fastrtps{ namespace rtps{ bool RTPSMessageCreator::addMessageAcknack(CDRMessage_t* msg,const GuidPrefix_t& guidprefix, @@ -78,7 +79,7 @@ bool RTPSMessageCreator::addSubmessageAcknack(CDRMessage_t* msg, return true; } - +} } } diff --git a/src/cpp/rtps/messages/submessages/DataMsg.hpp b/src/cpp/rtps/messages/submessages/DataMsg.hpp index 830d43d5d6f..ec18a1789d0 100644 --- a/src/cpp/rtps/messages/submessages/DataMsg.hpp +++ b/src/cpp/rtps/messages/submessages/DataMsg.hpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,9 +11,10 @@ * */ -using namespace eprosima::pubsub; +using namespace eprosima::fastrtps; namespace eprosima{ +namespace fastrtps{ namespace rtps{ @@ -181,7 +182,7 @@ bool RTPSMessageCreator::addSubmessageData(CDRMessage_t* msg,CacheChange_t* chan return added_no_error; } - +} } } diff --git a/src/cpp/rtps/messages/submessages/GapMsg.hpp b/src/cpp/rtps/messages/submessages/GapMsg.hpp index 078afa80a7d..80ac5083c6a 100644 --- a/src/cpp/rtps/messages/submessages/GapMsg.hpp +++ b/src/cpp/rtps/messages/submessages/GapMsg.hpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,6 +14,7 @@ namespace eprosima{ +namespace fastrtps{ namespace rtps{ bool RTPSMessageCreator::addMessageGap(CDRMessage_t* msg,GuidPrefix_t& guidprefix, @@ -74,6 +75,6 @@ bool RTPSMessageCreator::addSubmessageGap(CDRMessage_t* msg,SequenceNumber_t& se return true; } - +} } } diff --git a/src/cpp/rtps/messages/submessages/HeartbeatMsg.hpp b/src/cpp/rtps/messages/submessages/HeartbeatMsg.hpp index 52d02e056f2..770294a9c43 100644 --- a/src/cpp/rtps/messages/submessages/HeartbeatMsg.hpp +++ b/src/cpp/rtps/messages/submessages/HeartbeatMsg.hpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,6 +13,7 @@ namespace eprosima{ +namespace fastrtps{ namespace rtps{ bool RTPSMessageCreator::addMessageHeartbeat(CDRMessage_t* msg,const GuidPrefix_t& guidprefix,const EntityId_t& readerId,const EntityId_t& writerId, @@ -81,7 +82,7 @@ bool RTPSMessageCreator::addSubmessageHeartbeat(CDRMessage_t* msg,const EntityId return true; } - +} } } diff --git a/src/cpp/rtps/participant/RTPSParticipant.cpp b/src/cpp/rtps/participant/RTPSParticipant.cpp index 38b7f210d6f..007a61ae7b8 100644 --- a/src/cpp/rtps/participant/RTPSParticipant.cpp +++ b/src/cpp/rtps/participant/RTPSParticipant.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,11 +11,12 @@ * */ -#include "eprosimartps/rtps/participant/RTPSParticipant.h" -#include "eprosimartps/rtps/participant/RTPSParticipantImpl.h" -#include "eprosimartps/rtps/Endpoint.h" +#include "fastrtps/rtps/participant/RTPSParticipant.h" +#include "fastrtps/rtps/participant/RTPSParticipantImpl.h" +#include "fastrtps/rtps/Endpoint.h" namespace eprosima { +namespace fastrtps{ namespace rtps { RTPSParticipant::RTPSParticipant(RTPSParticipantImpl* pimpl):mp_impl(pimpl) @@ -65,7 +66,7 @@ uint32_t RTPSParticipant::getRTPSParticipantID() const } - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp index a74c3e71a33..b42379eda82 100644 --- a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp +++ b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,37 +11,38 @@ * */ -#include "eprosimartps/rtps/resources/ResourceSend.h" -#include "eprosimartps/rtps/resources/ResourceEvent.h" -#include "eprosimartps/rtps/resources/ListenResource.h" +#include "fastrtps/rtps/resources/ResourceSend.h" +#include "fastrtps/rtps/resources/ResourceEvent.h" +#include "fastrtps/rtps/resources/ListenResource.h" -#include "eprosimartps/rtps/participant/RTPSParticipantImpl.h" +#include "fastrtps/rtps/participant/RTPSParticipantImpl.h" -#include "eprosimartps/rtps/writer/StatelessWriter.h" -#include "eprosimartps/rtps/writer/StatefulWriter.h" +#include "fastrtps/rtps/writer/StatelessWriter.h" +#include "fastrtps/rtps/writer/StatefulWriter.h" -//#include "eprosimartps/reader/StatelessReader.h" -//#include "eprosimartps/reader/StatefulReader.h" +//#include "fastrtps/reader/StatelessReader.h" +//#include "fastrtps/reader/StatefulReader.h" -#include "eprosimartps/rtps/participant/RTPSParticipant.h" +#include "fastrtps/rtps/participant/RTPSParticipant.h" -#include "eprosimartps/rtps/RTPSDomain.h" +#include "fastrtps/rtps/RTPSDomain.h" -#include "eprosimartps/rtps/builtin/BuiltinProtocols.h" -#include "eprosimartps/rtps/builtin/discovery/participant/PDPSimple.h" +#include "fastrtps/rtps/builtin/BuiltinProtocols.h" +#include "fastrtps/rtps/builtin/discovery/participant/PDPSimple.h" -#include "eprosimartps/utils/IPFinder.h" -#include "eprosimartps/utils/eClock.h" +#include "fastrtps/utils/IPFinder.h" +#include "fastrtps/utils/eClock.h" #include #include #include -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" + -using namespace pubsub; namespace eprosima { +namespace fastrtps{ namespace rtps { @@ -685,7 +686,7 @@ bool RTPSParticipantImpl::deleteUserEndpoint(Endpoint* p_endpoint) // } // return m_builtinProtocols.mp_PDP->newRemoteEndpointStaticallyDiscovered(pguid,userDefinedId,kind); //} - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/reader/RTPSReader.cpp b/src/cpp/rtps/reader/RTPSReader.cpp index 0ada3c79283..e85e0ab409c 100644 --- a/src/cpp/rtps/reader/RTPSReader.cpp +++ b/src/cpp/rtps/reader/RTPSReader.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,11 +11,11 @@ * */ -#include "eprosimartps/rtps/reader/RTPSReader.h" +#include "fastrtps/rtps/reader/RTPSReader.h" -#include "eprosimartps/rtps/history/ReaderHistory.h" +#include "fastrtps/rtps/history/ReaderHistory.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" namespace eprosima { namespace rtps { diff --git a/src/cpp/rtps/reader/StatefulReader.cpp b/src/cpp/rtps/reader/StatefulReader.cpp index 16c6adc09ee..e8fbef4bb89 100644 --- a/src/cpp/rtps/reader/StatefulReader.cpp +++ b/src/cpp/rtps/reader/StatefulReader.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,13 +11,13 @@ * */ -#include "eprosimartps/rtps/reader/StatefulReader.h" +#include "fastrtps/rtps/reader/StatefulReader.h" #include #include -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" using namespace eprosima::pubsub; diff --git a/src/cpp/rtps/reader/StatelessReader.cpp b/src/cpp/rtps/reader/StatelessReader.cpp index 035f25b6e63..8bd48c957d7 100644 --- a/src/cpp/rtps/reader/StatelessReader.cpp +++ b/src/cpp/rtps/reader/StatelessReader.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,11 +11,11 @@ * */ -#include "eprosimartps/reader/StatelessReader.h" -#include "eprosimartps/reader/WriterProxyData.h" -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/pubsub/SampleInfo.h" -#include "eprosimartps/pubsub/TopicDataType.h" +#include "fastrtps/reader/StatelessReader.h" +#include "fastrtps/reader/WriterProxyData.h" +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/pubsub/SampleInfo.h" +#include "fastrtps/pubsub/TopicDataType.h" #include diff --git a/src/cpp/rtps/reader/WriterProxy.cpp b/src/cpp/rtps/reader/WriterProxy.cpp index acd2f05e2b7..377b6279435 100644 --- a/src/cpp/rtps/reader/WriterProxy.cpp +++ b/src/cpp/rtps/reader/WriterProxy.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,11 +11,11 @@ * */ -#include "eprosimartps/reader/WriterProxy.h" -#include "eprosimartps/reader/StatefulReader.h" -#include "eprosimartps/reader/WriterProxyData.h" -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/utils/TimeConversion.h" +#include "fastrtps/reader/WriterProxy.h" +#include "fastrtps/reader/StatefulReader.h" +#include "fastrtps/reader/WriterProxyData.h" +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/utils/TimeConversion.h" diff --git a/src/cpp/rtps/reader/WriterProxyData.cpp b/src/cpp/rtps/reader/WriterProxyData.cpp index 6dc5dacab8b..974395fe6fd 100644 --- a/src/cpp/rtps/reader/WriterProxyData.cpp +++ b/src/cpp/rtps/reader/WriterProxyData.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,11 +11,11 @@ * */ -#include "eprosimartps/reader/WriterProxyData.h" +#include "fastrtps/reader/WriterProxyData.h" -#include "eprosimartps/common/types/CDRMessage_t.h" +#include "fastrtps/common/types/CDRMessage_t.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" namespace eprosima { namespace rtps { diff --git a/src/cpp/rtps/reader/timedevent/HeartbeatResponseDelay.cpp b/src/cpp/rtps/reader/timedevent/HeartbeatResponseDelay.cpp index 7f9034bf43d..1d133b39385 100644 --- a/src/cpp/rtps/reader/timedevent/HeartbeatResponseDelay.cpp +++ b/src/cpp/rtps/reader/timedevent/HeartbeatResponseDelay.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,17 +11,17 @@ * */ -#include "eprosimartps/reader/timedevent/HeartbeatResponseDelay.h" -#include "eprosimartps/reader/WriterProxy.h" -#include "eprosimartps/reader/WriterProxyData.h" -#include "eprosimartps/reader/StatefulReader.h" +#include "fastrtps/reader/timedevent/HeartbeatResponseDelay.h" +#include "fastrtps/reader/WriterProxy.h" +#include "fastrtps/reader/WriterProxyData.h" +#include "fastrtps/reader/StatefulReader.h" -#include "eprosimartps/resources/ResourceSend.h" -#include "eprosimartps/resources/ResourceEvent.h" +#include "fastrtps/resources/ResourceSend.h" +#include "fastrtps/resources/ResourceEvent.h" -#include "eprosimartps/RTPSMessageCreator.h" +#include "fastrtps/RTPSMessageCreator.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" namespace eprosima { namespace rtps { diff --git a/src/cpp/rtps/reader/timedevent/WriterProxyLiveliness.cpp b/src/cpp/rtps/reader/timedevent/WriterProxyLiveliness.cpp index 05e323e5866..2cd9b23f5d7 100644 --- a/src/cpp/rtps/reader/timedevent/WriterProxyLiveliness.cpp +++ b/src/cpp/rtps/reader/timedevent/WriterProxyLiveliness.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,14 +11,14 @@ * */ -#include "eprosimartps/reader/timedevent/WriterProxyLiveliness.h" -#include "eprosimartps/reader/StatefulReader.h" -#include "eprosimartps/reader/WriterProxy.h" -#include "eprosimartps/reader/WriterProxyData.h" -#include "eprosimartps/resources/ResourceEvent.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/reader/timedevent/WriterProxyLiveliness.h" +#include "fastrtps/reader/StatefulReader.h" +#include "fastrtps/reader/WriterProxy.h" +#include "fastrtps/reader/WriterProxyData.h" +#include "fastrtps/resources/ResourceEvent.h" +#include "fastrtps/utils/RTPSLog.h" -#include "eprosimartps/pubsub/SubscriberListener.h" +#include "fastrtps/pubsub/SubscriberListener.h" diff --git a/src/cpp/rtps/resources/ListenResource.cpp b/src/cpp/rtps/resources/ListenResource.cpp index f2b0e212851..6d1c31ac03f 100644 --- a/src/cpp/rtps/resources/ListenResource.cpp +++ b/src/cpp/rtps/resources/ListenResource.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,15 +11,16 @@ * */ -#include "eprosimartps/rtps/writer/RTPSWriter.h" +#include "fastrtps/rtps/writer/RTPSWriter.h" -#include "eprosimartps/rtps/resources/ListenResource.h" -#include "eprosimartps/rtps/resources/ListenResourceImpl.h" -#include "eprosimartps/rtps/messages/MessageReceiver.h" +#include "fastrtps/rtps/resources/ListenResource.h" +#include "fastrtps/rtps/resources/ListenResourceImpl.h" +#include "fastrtps/rtps/messages/MessageReceiver.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" namespace eprosima { +namespace fastrtps{ namespace rtps { static const char* const CLASS_NAME = "ListenResource"; @@ -128,5 +129,5 @@ bool ListenResource::isListeningTo(Locator_t&loc) -} /* namespace rtps */ +}} /* namespace rtps */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/resources/ListenResourceImpl.cpp b/src/cpp/rtps/resources/ListenResourceImpl.cpp index 7b9cd9ce4da..f227d914cf0 100644 --- a/src/cpp/rtps/resources/ListenResourceImpl.cpp +++ b/src/cpp/rtps/resources/ListenResourceImpl.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,18 +11,19 @@ * */ -#include "eprosimartps/rtps/resources/ListenResourceImpl.h" -#include "eprosimartps/rtps/resources/ListenResource.h" -#include "eprosimartps/rtps/messages/MessageReceiver.h" -#include "eprosimartps/rtps/participant/RTPSParticipantImpl.h" +#include "fastrtps/rtps/resources/ListenResourceImpl.h" +#include "fastrtps/rtps/resources/ListenResource.h" +#include "fastrtps/rtps/messages/MessageReceiver.h" +#include "fastrtps/rtps/participant/RTPSParticipantImpl.h" -#include "eprosimartps/utils/IPFinder.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/IPFinder.h" +#include "fastrtps/utils/RTPSLog.h" using boost::asio::ip::udp; namespace eprosima { +namespace fastrtps{ namespace rtps { static const char* const CLASS_NAME = "ListenResourceImpl"; @@ -216,6 +217,6 @@ void ListenResourceImpl::run_io_service() this->m_io_service.run(); } - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/resources/ResourceEvent.cpp b/src/cpp/rtps/resources/ResourceEvent.cpp index 294c455e6e8..d10005c63d8 100644 --- a/src/cpp/rtps/resources/ResourceEvent.cpp +++ b/src/cpp/rtps/resources/ResourceEvent.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,15 +11,16 @@ * */ -#include "eprosimartps/rtps/resources/ResourceEvent.h" +#include "fastrtps/rtps/resources/ResourceEvent.h" #include #include #include -#include "eprosimartps/rtps/participant/RTPSParticipantImpl.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/rtps/participant/RTPSParticipantImpl.h" +#include "fastrtps/utils/RTPSLog.h" namespace eprosima { +namespace fastrtps{ namespace rtps { static const char* const CLASS_NAME = "ResourceEvent"; @@ -66,6 +67,6 @@ void ResourceEvent::announce_thread() mp_RTPSParticipantImpl->ResourceSemaphorePost(); } - -} /* namespace pubsub */ +} +} /* namespace */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/resources/ResourceSend.cpp b/src/cpp/rtps/resources/ResourceSend.cpp index 891735c18a8..9fb1664c5a6 100644 --- a/src/cpp/rtps/resources/ResourceSend.cpp +++ b/src/cpp/rtps/resources/ResourceSend.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,11 +11,12 @@ * */ -#include "eprosimartps/rtps/resources/ResourceSend.h" -#include "eprosimartps/rtps/resources/ResourceSendImpl.h" -#include "eprosimartps/rtps/participant/RTPSParticipantImpl.h" +#include "fastrtps/rtps/resources/ResourceSend.h" +#include "fastrtps/rtps/resources/ResourceSendImpl.h" +#include "fastrtps/rtps/participant/RTPSParticipantImpl.h" namespace eprosima { +namespace fastrtps{ namespace rtps { ResourceSend::ResourceSend() @@ -44,6 +45,6 @@ boost::recursive_mutex* ResourceSend::getMutex() { return mp_impl->getMutex(); } - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/resources/ResourceSendImpl.cpp b/src/cpp/rtps/resources/ResourceSendImpl.cpp index aa07f2f399a..5281fdea8f6 100644 --- a/src/cpp/rtps/resources/ResourceSendImpl.cpp +++ b/src/cpp/rtps/resources/ResourceSendImpl.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,13 +11,14 @@ * */ -#include "eprosimartps/rtps/resources/ResourceSendImpl.h" -#include "eprosimartps/rtps/common/CDRMessage_t.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/rtps/resources/ResourceSendImpl.h" +#include "fastrtps/rtps/common/CDRMessage_t.h" +#include "fastrtps/utils/RTPSLog.h" using boost::asio::ip::udp; namespace eprosima { +namespace fastrtps{ namespace rtps { static const char* const CLASS_NAME = "SendResource"; @@ -190,6 +191,6 @@ void ResourceSendImpl::sendSync(CDRMessage_t* msg, const Locator_t& loc) boost::recursive_mutex* ResourceSendImpl::getMutex() {return mp_mutex;} - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/resources/TimedEvent.cpp b/src/cpp/rtps/resources/TimedEvent.cpp index 8ce593ee143..87de1a559da 100644 --- a/src/cpp/rtps/resources/TimedEvent.cpp +++ b/src/cpp/rtps/resources/TimedEvent.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,12 +11,13 @@ * */ -#include "eprosimartps/rtps/resources/TimedEvent.h" -#include "eprosimartps/rtps/resources/TimedEventImpl.h" +#include "fastrtps/rtps/resources/TimedEvent.h" +#include "fastrtps/rtps/resources/TimedEventImpl.h" namespace eprosima { +namespace fastrtps{ namespace rtps { TimedEvent::TimedEvent(boost::asio::io_service* serv,double milliseconds) @@ -53,6 +54,6 @@ double TimedEvent::getIntervalMilliSec() { return mp_impl->getIntervalMsec(); } - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/resources/TimedEventImpl.cpp b/src/cpp/rtps/resources/TimedEventImpl.cpp index 379779d20ee..0827182ea3d 100644 --- a/src/cpp/rtps/resources/TimedEventImpl.cpp +++ b/src/cpp/rtps/resources/TimedEventImpl.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -12,12 +12,13 @@ */ -#include "eprosimartps/rtps/resources/TimedEventImpl.h" -#include "eprosimartps/rtps/resources/TimedEvent.h" -#include "eprosimartps/utils/TimeConversion.h" +#include "fastrtps/rtps/resources/TimedEventImpl.h" +#include "fastrtps/rtps/resources/TimedEvent.h" +#include "fastrtps/utils/TimeConversion.h" namespace eprosima{ +namespace fastrtps{ namespace rtps{ @@ -86,7 +87,7 @@ void TimedEventImpl::event(const boost::system::error_code& ec) } } - +} } } diff --git a/src/cpp/rtps/writer/RTPSWriter.cpp b/src/cpp/rtps/writer/RTPSWriter.cpp index 79ee41c2459..da34ade7023 100644 --- a/src/cpp/rtps/writer/RTPSWriter.cpp +++ b/src/cpp/rtps/writer/RTPSWriter.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,15 +11,16 @@ * */ -#include "eprosimartps/rtps/writer/RTPSWriter.h" +#include "fastrtps/rtps/writer/RTPSWriter.h" -#include "eprosimartps/rtps/history/WriterHistory.h" +#include "fastrtps/rtps/history/WriterHistory.h" -#include "eprosimartps/rtps/messages/RTPSMessageCreator.h" +#include "fastrtps/rtps/messages/RTPSMessageCreator.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" namespace eprosima { +namespace fastrtps{ namespace rtps { static const char* const CLASS_NAME = "RTPSWriter"; @@ -184,3 +185,4 @@ SequenceNumber_t RTPSWriter::get_seq_num_max() } /* namespace eprosima */ +} diff --git a/src/cpp/rtps/writer/ReaderLocator.cpp b/src/cpp/rtps/writer/ReaderLocator.cpp index 52daa90a719..aba6cc1dcd3 100644 --- a/src/cpp/rtps/writer/ReaderLocator.cpp +++ b/src/cpp/rtps/writer/ReaderLocator.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,11 +11,12 @@ * */ -#include "eprosimartps/rtps/writer/ReaderLocator.h" -#include "eprosimartps/rtps/common/CacheChange.h" +#include "fastrtps/rtps/writer/ReaderLocator.h" +#include "fastrtps/rtps/common/CacheChange.h" namespace eprosima { +namespace fastrtps{ namespace rtps { ReaderLocator::ReaderLocator() { @@ -112,7 +113,7 @@ bool ReaderLocator::remove_unsent_change(CacheChange_t* cpoin){ } return false; } - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/writer/ReaderProxy.cpp b/src/cpp/rtps/writer/ReaderProxy.cpp index 22652c4c5f9..1e8d38b1dd9 100644 --- a/src/cpp/rtps/writer/ReaderProxy.cpp +++ b/src/cpp/rtps/writer/ReaderProxy.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved.endl * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -12,20 +12,21 @@ */ -#include "eprosimartps/rtps/writer/ReaderProxy.h" +#include "fastrtps/rtps/writer/ReaderProxy.h" -#include "eprosimartps/rtps/writer/StatefulWriter.h" -#include "eprosimartps/utils/TimeConversion.h" +#include "fastrtps/rtps/writer/StatefulWriter.h" +#include "fastrtps/utils/TimeConversion.h" -#include "eprosimartps/rtps/writer/timedevent/NackResponseDelay.h" -#include "eprosimartps/rtps/writer/timedevent/NackSupressionDuration.h" +#include "fastrtps/rtps/writer/timedevent/NackResponseDelay.h" +#include "fastrtps/rtps/writer/timedevent/NackSupressionDuration.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" #include #include namespace eprosima { +namespace fastrtps{ namespace rtps { static const char* const CLASS_NAME = "ReaderProxy"; @@ -213,11 +214,11 @@ bool ReaderProxy::minChange(std::vector* Changes, return true; } -bool ReaderProxy::pubsub_is_relevant(CacheChange_t* change) +bool ReaderProxy::rtps_is_relevant(CacheChange_t* change) { return true; } - +} } /* namespace rtps */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/writer/StatefulWriter.cpp b/src/cpp/rtps/writer/StatefulWriter.cpp index c18491573df..427f5630361 100644 --- a/src/cpp/rtps/writer/StatefulWriter.cpp +++ b/src/cpp/rtps/writer/StatefulWriter.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,30 +11,31 @@ * */ -#include "eprosimartps/rtps/writer/StatefulWriter.h" -#include "eprosimartps/rtps/writer/ReaderProxy.h" +#include "fastrtps/rtps/writer/StatefulWriter.h" +#include "fastrtps/rtps/writer/ReaderProxy.h" -#include "eprosimartps/rtps/participant/RTPSParticipantImpl.h" +#include "fastrtps/rtps/participant/RTPSParticipantImpl.h" -#include "eprosimartps/rtps/messages/RTPSMessageCreator.h" +#include "fastrtps/rtps/messages/RTPSMessageCreator.h" -#include "eprosimartps/rtps/resources/ResourceSend.h" +#include "fastrtps/rtps/resources/ResourceSend.h" -#include "eprosimartps/utils/TimeConversion.h" +#include "fastrtps/utils/TimeConversion.h" -#include "eprosimartps/rtps/writer/timedevent/UnsentChangesNotEmptyEvent.h" -#include "eprosimartps/rtps/writer/timedevent/PeriodicHeartbeat.h" -#include "eprosimartps/rtps/writer/timedevent/NackSupressionDuration.h" -#include "eprosimartps/rtps/writer/timedevent/NackResponseDelay.h" +#include "fastrtps/rtps/writer/timedevent/UnsentChangesNotEmptyEvent.h" +#include "fastrtps/rtps/writer/timedevent/PeriodicHeartbeat.h" +#include "fastrtps/rtps/writer/timedevent/NackSupressionDuration.h" +#include "fastrtps/rtps/writer/timedevent/NackResponseDelay.h" -#include "eprosimartps/rtps/history/WriterHistory.h" +#include "fastrtps/rtps/history/WriterHistory.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" #include #include namespace eprosima { +namespace fastrtps{ namespace rtps { static const char* const CLASS_NAME = "StatefulWriter"; @@ -87,7 +88,7 @@ void StatefulWriter::unsent_change_added_to_history(CacheChange_t* change) changeForReader.status = UNSENT; else changeForReader.status = UNACKNOWLEDGED; - changeForReader.is_relevant = (*it)->pubsub_is_relevant(change); + changeForReader.is_relevant = (*it)->rtps_is_relevant(change); (*it)->m_changesForReader.push_back(changeForReader); } unsent_changes_not_empty(); @@ -224,7 +225,7 @@ bool StatefulWriter::matched_reader_add(RemoteReaderAttributes& rdata) { ChangeForReader_t changeForReader; changeForReader.setChange(*cit); - changeForReader.is_relevant = rp->pubsub_is_relevant(*cit); + changeForReader.is_relevant = rp->rtps_is_relevant(*cit); if(m_pushMode) changeForReader.status = UNSENT; @@ -418,3 +419,4 @@ void StatefulWriter::updateTimes(WriterTimes& times) } /* namespace rtps */ } /* namespace eprosima */ +} diff --git a/src/cpp/rtps/writer/StatelessWriter.cpp b/src/cpp/rtps/writer/StatelessWriter.cpp index d22997f89ed..a67321fd377 100644 --- a/src/cpp/rtps/writer/StatelessWriter.cpp +++ b/src/cpp/rtps/writer/StatelessWriter.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,16 +11,17 @@ * */ -#include "eprosimartps/rtps/writer/StatelessWriter.h" -#include "eprosimartps/rtps/history/WriterHistory.h" -#include "eprosimartps/rtps/writer/timedevent/UnsentChangesNotEmptyEvent.h" +#include "fastrtps/rtps/writer/StatelessWriter.h" +#include "fastrtps/rtps/history/WriterHistory.h" +#include "fastrtps/rtps/writer/timedevent/UnsentChangesNotEmptyEvent.h" #include #include -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" namespace eprosima { +namespace fastrtps{ namespace rtps { static const char* const CLASS_NAME = "StatelessWriter"; @@ -365,3 +366,4 @@ bool StatelessWriter::remove_locator(Locator_t& loc) } /* namespace eprosima */ +} diff --git a/src/cpp/rtps/writer/timedevent/NackResponseDelay.cpp b/src/cpp/rtps/writer/timedevent/NackResponseDelay.cpp index 7432753c2df..86ef7fae74c 100644 --- a/src/cpp/rtps/writer/timedevent/NackResponseDelay.cpp +++ b/src/cpp/rtps/writer/timedevent/NackResponseDelay.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,20 +11,21 @@ * */ -#include "eprosimartps/rtps/writer/timedevent/NackResponseDelay.h" +#include "fastrtps/rtps/writer/timedevent/NackResponseDelay.h" -#include "eprosimartps/rtps/writer/StatefulWriter.h" -#include "eprosimartps/rtps/writer/ReaderProxy.h" -#include "eprosimartps/rtps/participant/RTPSParticipantImpl.h" +#include "fastrtps/rtps/writer/StatefulWriter.h" +#include "fastrtps/rtps/writer/ReaderProxy.h" +#include "fastrtps/rtps/participant/RTPSParticipantImpl.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" -#include "eprosimartps/rtps/messages/RTPSMessageCreator.h" +#include "fastrtps/rtps/messages/RTPSMessageCreator.h" #include #include namespace eprosima { +namespace fastrtps{ namespace rtps { static const char* const CLASS_NAME = "NackResponseDelay"; @@ -121,6 +122,6 @@ void NackResponseDelay::event(EventCode code, const char* msg) } } - -} /* namespace dds */ +} +} /* namespace */ } /* namespace eprosima */ diff --git a/src/cpp/rtps/writer/timedevent/NackSupressionDuration.cpp b/src/cpp/rtps/writer/timedevent/NackSupressionDuration.cpp index 96e1b136da3..fc3b3d98cb4 100644 --- a/src/cpp/rtps/writer/timedevent/NackSupressionDuration.cpp +++ b/src/cpp/rtps/writer/timedevent/NackSupressionDuration.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,16 +11,17 @@ * */ -#include "eprosimartps/rtps/writer/timedevent/NackSupressionDuration.h" -#include "eprosimartps/rtps/writer/StatefulWriter.h" -#include "eprosimartps/rtps/writer/ReaderProxy.h" -#include "eprosimartps/rtps/participant/RTPSParticipantImpl.h" +#include "fastrtps/rtps/writer/timedevent/NackSupressionDuration.h" +#include "fastrtps/rtps/writer/StatefulWriter.h" +#include "fastrtps/rtps/writer/ReaderProxy.h" +#include "fastrtps/rtps/participant/RTPSParticipantImpl.h" #include #include -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" namespace eprosima { +namespace fastrtps{ namespace rtps { static const char* const CLASS_NAME = "NackSupressionDuration"; @@ -67,6 +68,6 @@ void NackSupressionDuration::event(EventCode code, const char* msg) logInfo(RTPS_WRITER,"Boost message: " < #include -#include "eprosimartps/utils/eClock.h" +#include "fastrtps/utils/eClock.h" +using namespace eprosima::fastrtps::rtps; + namespace eprosima { -namespace rtps { +namespace fastrtps { //FIXME: UTC SECONDS AUTOMATICALLY eClock::eClock(): m_seconds_from_1900_to_1970(0), diff --git a/src/cpp/utils/md5.cpp b/src/cpp/utils/md5.cpp index 837ae91b254..62836fcfe8d 100755 --- a/src/cpp/utils/md5.cpp +++ b/src/cpp/utils/md5.cpp @@ -32,7 +32,7 @@ documentation and/or software. */ /* interface header */ -#include "eprosimartps/utils/md5.h" +#include "fastrtps/utils/md5.h" /* system implementation headers */ #include diff --git a/utils/ShapesDemo/ShapesDemo.pro b/utils/ShapesDemo/ShapesDemo.pro index be712c68147..cc8ff8dde25 100644 --- a/utils/ShapesDemo/ShapesDemo.pro +++ b/utils/ShapesDemo/ShapesDemo.pro @@ -49,16 +49,16 @@ FORMS += forms/mainwindow.ui \ UI_DIR = $$_PRO_FILE_PWD_/forms/ui/ MOC_DIR = $$_PRO_FILE_PWD_/forms/ui/ -unix: CONFIG(release, debug|release):LIBS += -L$$PWD/../../lib/x64Linux2.6gcc/ -leprosimartps -else:unix: CONFIG(debug, debug|release):LIBS += -L$$PWD/../../lib/x64Linux2.6gcc/ -leprosimartpsd +unix: CONFIG(release, debug|release):LIBS += -L$$PWD/../../lib/x64Linux2.6gcc/ -lfastrtps +else:unix: CONFIG(debug, debug|release):LIBS += -L$$PWD/../../lib/x64Linux2.6gcc/ -lfastrtpsd INCLUDEPATH += $$PWD/../../include INCLUDEPATH += $$PWD/../../thirdparty/eprosima-common-code DEPENDPATH += $$PWD/../../include DEPENDPATH += $$PWD/../../thirdparty/eprosima-common-code -unix: CONFIG(debug, debug|release): PRE_TARGETDEPS += $$PWD/../../lib/x64Linux2.6gcc/libeprosimartpsd.a -else:unix: CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/../../lib/x64Linux2.6gcc/libeprosimartps.a +unix: CONFIG(debug, debug|release): PRE_TARGETDEPS += $$PWD/../../lib/x64Linux2.6gcc/libfastrtpsd.a +else:unix: CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/../../lib/x64Linux2.6gcc/libfastrtps.a @@ -104,14 +104,14 @@ SOURCES += \ -win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../lib/i86Win32VS2010 -llibeprosimartps-0.5.1 -L"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Lib" -lShlwapi -lIphlpapi -win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../lib/i86Win32VS2010 -llibeprosimartpsd-0.5.1 -L"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Lib" -lShlwapi -lIphlpapi +win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../lib/i86Win32VS2010 -llibfastrtps-0.5.1 -L"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Lib" -lShlwapi -lIphlpapi +win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../lib/i86Win32VS2010 -llibfastrtpsd-0.5.1 -L"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Lib" -lShlwapi -lIphlpapi INCLUDEPATH += $$PWD/../../include2 DEPENDPATH += $$PWD/../../include2 -win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/../../lib/i86Win32VS2010/libeprosimartps-0.5.1.lib +win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/../../lib/i86Win32VS2010/libfastrtps-0.5.1.lib @@ -119,8 +119,8 @@ win32:INCLUDEPATH += $$PWD/../../include win32:DEPENDPATH += $$PWD/../../lib/i86Win32VS2010 C:\Windows\System32 -#win32:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/../../lib/i86Win32VS2010/libeprosimartps-0.5.1.lib Shlwapi.lib Iphlpapi.lib -#win32:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$PWD/../../lib/i86Win32VS2010/libeprosimartpsd-0.5.1.lib Shlwapi.lib Iphlpapi.lib +#win32:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/../../lib/i86Win32VS2010/libfastrtps-0.5.1.lib Shlwapi.lib Iphlpapi.lib +#win32:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$PWD/../../lib/i86Win32VS2010/libfastrtpsd-0.5.1.lib Shlwapi.lib Iphlpapi.lib RESOURCES += \ images/eprosimalogo.qrc diff --git a/utils/ShapesDemo/include/eprosimashapesdemo/qt/ContentFilterSelector.h b/utils/ShapesDemo/include/eprosimashapesdemo/qt/ContentFilterSelector.h index ccc9e4bacda..52bc6252d63 100644 --- a/utils/ShapesDemo/include/eprosimashapesdemo/qt/ContentFilterSelector.h +++ b/utils/ShapesDemo/include/eprosimashapesdemo/qt/ContentFilterSelector.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/ShapesDemo/include/eprosimashapesdemo/qt/DrawArea.h b/utils/ShapesDemo/include/eprosimashapesdemo/qt/DrawArea.h index 5c8f84a72ab..104c43ebd3f 100644 --- a/utils/ShapesDemo/include/eprosimashapesdemo/qt/DrawArea.h +++ b/utils/ShapesDemo/include/eprosimashapesdemo/qt/DrawArea.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/ShapesDemo/include/eprosimashapesdemo/qt/UpdateThread.h b/utils/ShapesDemo/include/eprosimashapesdemo/qt/UpdateThread.h index e5f06f9eee0..a7da65f8926 100644 --- a/utils/ShapesDemo/include/eprosimashapesdemo/qt/UpdateThread.h +++ b/utils/ShapesDemo/include/eprosimashapesdemo/qt/UpdateThread.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/ShapesDemo/include/eprosimashapesdemo/qt/mainwindow.h b/utils/ShapesDemo/include/eprosimashapesdemo/qt/mainwindow.h index 6ea4bb02735..5b08a1673d5 100644 --- a/utils/ShapesDemo/include/eprosimashapesdemo/qt/mainwindow.h +++ b/utils/ShapesDemo/include/eprosimashapesdemo/qt/mainwindow.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ #ifndef MAINWINDOW_H diff --git a/utils/ShapesDemo/include/eprosimashapesdemo/qt/optionsdialog.h b/utils/ShapesDemo/include/eprosimashapesdemo/qt/optionsdialog.h index daef11fd23a..540b93fa143 100644 --- a/utils/ShapesDemo/include/eprosimashapesdemo/qt/optionsdialog.h +++ b/utils/ShapesDemo/include/eprosimashapesdemo/qt/optionsdialog.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ #ifndef OPTIONSDIALOG_H diff --git a/utils/ShapesDemo/include/eprosimashapesdemo/qt/publishdialog.h b/utils/ShapesDemo/include/eprosimashapesdemo/qt/publishdialog.h index 13c4ef21263..484c66cc826 100644 --- a/utils/ShapesDemo/include/eprosimashapesdemo/qt/publishdialog.h +++ b/utils/ShapesDemo/include/eprosimashapesdemo/qt/publishdialog.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ #ifndef PUBLISHDIALOG_H diff --git a/utils/ShapesDemo/include/eprosimashapesdemo/qt/subscribedialog.h b/utils/ShapesDemo/include/eprosimashapesdemo/qt/subscribedialog.h index 308fbb2258b..b20450b6cb5 100644 --- a/utils/ShapesDemo/include/eprosimashapesdemo/qt/subscribedialog.h +++ b/utils/ShapesDemo/include/eprosimashapesdemo/qt/subscribedialog.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ #ifndef SUBSCRIBEDIALOG_H diff --git a/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/Shape.h b/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/Shape.h index 10fb6687d24..e44ae9ae9d2 100644 --- a/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/Shape.h +++ b/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/Shape.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,8 +13,8 @@ #ifndef SHAPE_H_ #define SHAPE_H_ -#include "eprosimartps/common/types/Time_t.h" -#include "eprosimartps/common/types/Guid.h" +#include "fastrtps/common/types/Time_t.h" +#include "fastrtps/common/types/Guid.h" using namespace eprosima::rtps; diff --git a/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapeHistory.h b/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapeHistory.h index 74a4fc3e524..eab1b72544a 100644 --- a/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapeHistory.h +++ b/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapeHistory.h @@ -2,12 +2,12 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ #ifndef SHAPEHISTORY_H #define SHAPEHISTORY_H -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "eprosimashapesdemo/shapesdemo/Shape.h" #include #include diff --git a/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapePublisher.h b/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapePublisher.h index 9ac9fe7e0ac..162a833ee11 100644 --- a/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapePublisher.h +++ b/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapePublisher.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef SHAPEPUBLISHER_H_ #define SHAPEPUBLISHER_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "eprosimashapesdemo/shapesdemo/Shape.h" #include diff --git a/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapeSubscriber.h b/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapeSubscriber.h index 7bcf22c4d9d..fec23063cb7 100644 --- a/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapeSubscriber.h +++ b/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapeSubscriber.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef SHAPESUBSCRIBER_H_ #define SHAPESUBSCRIBER_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "eprosimashapesdemo/shapesdemo/Shape.h" #include "eprosimashapesdemo/shapesdemo/ShapesDemo.h" #include "eprosimashapesdemo/shapesdemo/ShapeHistory.h" diff --git a/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapeTopicDataType.h b/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapeTopicDataType.h index a8068ffea23..4c68996c263 100644 --- a/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapeTopicDataType.h +++ b/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapeTopicDataType.h @@ -2,10 +2,10 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "eprosimashapesdemo/shapesdemo/Shape.h" diff --git a/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapesDemo.h b/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapesDemo.h index dd41f624d11..8d840280e15 100644 --- a/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapesDemo.h +++ b/utils/ShapesDemo/include/eprosimashapesdemo/shapesdemo/ShapesDemo.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,7 +13,7 @@ #ifndef SHAPESDEMO_H_ #define SHAPESDEMO_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "eprosimashapesdemo/shapesdemo/ShapeTopicDataType.h" #include "eprosimashapesdemo/shapesdemo/ShapeDefinitions.h" #include diff --git a/utils/ShapesDemo/src/main.cpp b/utils/ShapesDemo/src/main.cpp index d1cf7b7b97f..7f777cf88c7 100644 --- a/utils/ShapesDemo/src/main.cpp +++ b/utils/ShapesDemo/src/main.cpp @@ -1,6 +1,6 @@ #include "eprosimashapesdemo/qt/mainwindow.h" -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/utils/eClock.h" +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/utils/eClock.h" #include //#include #include "eprosimashapesdemo/utils/md5.h" diff --git a/utils/ShapesDemo/src/qt/ContentFilterSelector.cpp b/utils/ShapesDemo/src/qt/ContentFilterSelector.cpp index 3f5357304ad..c455eb19599 100644 --- a/utils/ShapesDemo/src/qt/ContentFilterSelector.cpp +++ b/utils/ShapesDemo/src/qt/ContentFilterSelector.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/ShapesDemo/src/qt/DrawArea.cpp b/utils/ShapesDemo/src/qt/DrawArea.cpp index 4f4f5820bb7..4d6b0d0fbe9 100644 --- a/utils/ShapesDemo/src/qt/DrawArea.cpp +++ b/utils/ShapesDemo/src/qt/DrawArea.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/ShapesDemo/src/qt/UpdateThread.cpp b/utils/ShapesDemo/src/qt/UpdateThread.cpp index 1611f7c38d8..19df45e2ce6 100644 --- a/utils/ShapesDemo/src/qt/UpdateThread.cpp +++ b/utils/ShapesDemo/src/qt/UpdateThread.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/ShapesDemo/src/qt/mainwindow.cpp b/utils/ShapesDemo/src/qt/mainwindow.cpp index f039ef87a5b..9c4acacf05c 100644 --- a/utils/ShapesDemo/src/qt/mainwindow.cpp +++ b/utils/ShapesDemo/src/qt/mainwindow.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ #include "eprosimashapesdemo/qt/mainwindow.h" diff --git a/utils/ShapesDemo/src/qt/publishdialog.cpp b/utils/ShapesDemo/src/qt/publishdialog.cpp index 44e94b9af7e..8ed58c256f5 100644 --- a/utils/ShapesDemo/src/qt/publishdialog.cpp +++ b/utils/ShapesDemo/src/qt/publishdialog.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ #include "eprosimashapesdemo/qt/publishdialog.h" @@ -11,7 +11,7 @@ #include "eprosimashapesdemo/shapesdemo/ShapesDemo.h" #include "eprosimashapesdemo/shapesdemo/ShapePublisher.h" -#include "eprosimartps/utils/TimeConversion.h" +#include "fastrtps/utils/TimeConversion.h" PublishDialog::PublishDialog(ShapesDemo* psd,QWidget *parent) : diff --git a/utils/ShapesDemo/src/qt/subscribedialog.cpp b/utils/ShapesDemo/src/qt/subscribedialog.cpp index 14e51d0b595..d8d2564f363 100644 --- a/utils/ShapesDemo/src/qt/subscribedialog.cpp +++ b/utils/ShapesDemo/src/qt/subscribedialog.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ #include "eprosimashapesdemo/qt/subscribedialog.h" @@ -10,7 +10,7 @@ #include "eprosimashapesdemo/shapesdemo/ShapesDemo.h" #include "eprosimashapesdemo/shapesdemo/ShapeSubscriber.h" -#include "eprosimartps/utils/TimeConversion.h" +#include "fastrtps/utils/TimeConversion.h" #include diff --git a/utils/ShapesDemo/src/shapesdemo/ShapeHistory.cpp b/utils/ShapesDemo/src/shapesdemo/ShapeHistory.cpp index 8d2c145f3af..16c58496dc2 100644 --- a/utils/ShapesDemo/src/shapesdemo/ShapeHistory.cpp +++ b/utils/ShapesDemo/src/shapesdemo/ShapeHistory.cpp @@ -2,11 +2,11 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ #include "eprosimashapesdemo/shapesdemo/ShapeHistory.h" -#include "eprosimartps/utils/TimeConversion.h" +#include "fastrtps/utils/TimeConversion.h" inline bool compareGUID(GUID_t& g1, GUID_t& g2) { for(uint8_t i =0;i<16;++i) diff --git a/utils/ShapesDemo/src/shapesdemo/ShapePublisher.cpp b/utils/ShapesDemo/src/shapesdemo/ShapePublisher.cpp index a99712731b3..cd26fcec23f 100644 --- a/utils/ShapesDemo/src/shapesdemo/ShapePublisher.cpp +++ b/utils/ShapesDemo/src/shapesdemo/ShapePublisher.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/ShapesDemo/src/shapesdemo/ShapeSubscriber.cpp b/utils/ShapesDemo/src/shapesdemo/ShapeSubscriber.cpp index fc8362bded5..adb1545cbfb 100644 --- a/utils/ShapesDemo/src/shapesdemo/ShapeSubscriber.cpp +++ b/utils/ShapesDemo/src/shapesdemo/ShapeSubscriber.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,7 +13,7 @@ #include "eprosimashapesdemo/shapesdemo/ShapeSubscriber.h" #include "eprosimashapesdemo/qt/ContentFilterSelector.h" -#include "eprosimartps/utils/TimeConversion.h" +#include "fastrtps/utils/TimeConversion.h" ShapeSubscriber::ShapeSubscriber(RTPSParticipant* par): mp_sub(NULL), diff --git a/utils/ShapesDemo/src/shapesdemo/ShapeTopicDataType.cpp b/utils/ShapesDemo/src/shapesdemo/ShapeTopicDataType.cpp index 26ab1928424..649d8543ddb 100644 --- a/utils/ShapesDemo/src/shapesdemo/ShapeTopicDataType.cpp +++ b/utils/ShapesDemo/src/shapesdemo/ShapeTopicDataType.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ #include "eprosimashapesdemo/shapesdemo/ShapeTopicDataType.h" diff --git a/utils/ShapesDemo/src/shapesdemo/ShapesDemo.cpp b/utils/ShapesDemo/src/shapesdemo/ShapesDemo.cpp index 54cd58c2ac1..ecef2b455e9 100644 --- a/utils/ShapesDemo/src/shapesdemo/ShapesDemo.cpp +++ b/utils/ShapesDemo/src/shapesdemo/ShapesDemo.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -53,7 +53,7 @@ bool ShapesDemo::init() { cout <<"Creating new RTPSParticipant"< #include diff --git a/utils/ShapesDemo_nogui/include/eprosimashapesdemo/shapesdemo/ShapePublisher.h b/utils/ShapesDemo_nogui/include/eprosimashapesdemo/shapesdemo/ShapePublisher.h index 596ee829740..50162ed4da9 100755 --- a/utils/ShapesDemo_nogui/include/eprosimashapesdemo/shapesdemo/ShapePublisher.h +++ b/utils/ShapesDemo_nogui/include/eprosimashapesdemo/shapesdemo/ShapePublisher.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef SHAPEPUBLISHER_H_ #define SHAPEPUBLISHER_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "eprosimashapesdemo/shapesdemo/Shape.h" //#include diff --git a/utils/ShapesDemo_nogui/include/eprosimashapesdemo/shapesdemo/ShapeSubscriber.h b/utils/ShapesDemo_nogui/include/eprosimashapesdemo/shapesdemo/ShapeSubscriber.h index ad851cba611..dda1fd523cc 100755 --- a/utils/ShapesDemo_nogui/include/eprosimashapesdemo/shapesdemo/ShapeSubscriber.h +++ b/utils/ShapesDemo_nogui/include/eprosimashapesdemo/shapesdemo/ShapeSubscriber.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef SHAPESUBSCRIBER_H_ #define SHAPESUBSCRIBER_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "eprosimashapesdemo/shapesdemo/Shape.h" #include "eprosimashapesdemo/shapesdemo/ShapesDemo.h" #include "eprosimashapesdemo/shapesdemo/ShapeHistory.h" diff --git a/utils/ShapesDemo_nogui/include/eprosimashapesdemo/shapesdemo/ShapeTopicDataType.h b/utils/ShapesDemo_nogui/include/eprosimashapesdemo/shapesdemo/ShapeTopicDataType.h index 23e9bc192da..56bee88b3b2 100755 --- a/utils/ShapesDemo_nogui/include/eprosimashapesdemo/shapesdemo/ShapeTopicDataType.h +++ b/utils/ShapesDemo_nogui/include/eprosimashapesdemo/shapesdemo/ShapeTopicDataType.h @@ -2,10 +2,10 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ -#include "eprosimartps/dds/DDSTopicDataType.h" +#include "fastrtps/dds/DDSTopicDataType.h" #include "eprosimashapesdemo/shapesdemo/Shape.h" diff --git a/utils/ShapesDemo_nogui/include/eprosimashapesdemo/shapesdemo/ShapesDemo.h b/utils/ShapesDemo_nogui/include/eprosimashapesdemo/shapesdemo/ShapesDemo.h index b8dfc314651..bf5592bb160 100755 --- a/utils/ShapesDemo_nogui/include/eprosimashapesdemo/shapesdemo/ShapesDemo.h +++ b/utils/ShapesDemo_nogui/include/eprosimashapesdemo/shapesdemo/ShapesDemo.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,7 +13,7 @@ #ifndef SHAPESDEMO_H_ #define SHAPESDEMO_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "eprosimashapesdemo/shapesdemo/ShapeTopicDataType.h" #include "eprosimashapesdemo/shapesdemo/ShapeDefinitions.h" //#include diff --git a/utils/ShapesDemo_nogui/include/eprosimashapesdemo/utils/md5.h b/utils/ShapesDemo_nogui/include/eprosimashapesdemo/utils/md5.h index d03a17a7112..b50c49ec160 100644 --- a/utils/ShapesDemo_nogui/include/eprosimashapesdemo/utils/md5.h +++ b/utils/ShapesDemo_nogui/include/eprosimashapesdemo/utils/md5.h @@ -36,7 +36,7 @@ documentation and/or software. #include #include -#include "eprosimartps/eprosimartps_dll.h" +#include "fastrtps/fastrtps_dll.h" // a small class for calculating MD5 hashes of strings or byte arrays // it is not meant to be fast or secure diff --git a/utils/ShapesDemo_nogui/src/main.cpp b/utils/ShapesDemo_nogui/src/main.cpp index ed6a7f1cb9d..7aaddf68ddb 100755 --- a/utils/ShapesDemo_nogui/src/main.cpp +++ b/utils/ShapesDemo_nogui/src/main.cpp @@ -1,4 +1,4 @@ -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/utils/RTPSLog.h" #include "eprosimashapesdemo/utils/md5.h" #include "eprosimashapesdemo/shapesdemo/ShapesDemo.h" diff --git a/utils/ShapesDemo_nogui/src/shapesdemo/ShapeHistory.cpp b/utils/ShapesDemo_nogui/src/shapesdemo/ShapeHistory.cpp index 8d2c145f3af..16c58496dc2 100755 --- a/utils/ShapesDemo_nogui/src/shapesdemo/ShapeHistory.cpp +++ b/utils/ShapesDemo_nogui/src/shapesdemo/ShapeHistory.cpp @@ -2,11 +2,11 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ #include "eprosimashapesdemo/shapesdemo/ShapeHistory.h" -#include "eprosimartps/utils/TimeConversion.h" +#include "fastrtps/utils/TimeConversion.h" inline bool compareGUID(GUID_t& g1, GUID_t& g2) { for(uint8_t i =0;i<16;++i) diff --git a/utils/ShapesDemo_nogui/src/shapesdemo/ShapePublisher.cpp b/utils/ShapesDemo_nogui/src/shapesdemo/ShapePublisher.cpp index 4f2b3713dbf..07885918185 100755 --- a/utils/ShapesDemo_nogui/src/shapesdemo/ShapePublisher.cpp +++ b/utils/ShapesDemo_nogui/src/shapesdemo/ShapePublisher.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/ShapesDemo_nogui/src/shapesdemo/ShapeSubscriber.cpp b/utils/ShapesDemo_nogui/src/shapesdemo/ShapeSubscriber.cpp index 0dbcc0f285a..7a4db4e7073 100755 --- a/utils/ShapesDemo_nogui/src/shapesdemo/ShapeSubscriber.cpp +++ b/utils/ShapesDemo_nogui/src/shapesdemo/ShapeSubscriber.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -13,7 +13,7 @@ #include "eprosimashapesdemo/shapesdemo/ShapeSubscriber.h" #include "eprosimashapesdemo/qt/ContentFilterSelector.h" -#include "eprosimartps/utils/TimeConversion.h" +#include "fastrtps/utils/TimeConversion.h" ShapeSubscriber::ShapeSubscriber(RTPSParticipant* par): mp_sub(NULL), diff --git a/utils/ShapesDemo_nogui/src/shapesdemo/ShapeTopicDataType.cpp b/utils/ShapesDemo_nogui/src/shapesdemo/ShapeTopicDataType.cpp index 26ab1928424..649d8543ddb 100755 --- a/utils/ShapesDemo_nogui/src/shapesdemo/ShapeTopicDataType.cpp +++ b/utils/ShapesDemo_nogui/src/shapesdemo/ShapeTopicDataType.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ #include "eprosimashapesdemo/shapesdemo/ShapeTopicDataType.h" diff --git a/utils/ShapesDemo_nogui/src/shapesdemo/ShapesDemo.cpp b/utils/ShapesDemo_nogui/src/shapesdemo/ShapesDemo.cpp index 61e8b570e02..0ad592c11b4 100755 --- a/utils/ShapesDemo_nogui/src/shapesdemo/ShapesDemo.cpp +++ b/utils/ShapesDemo_nogui/src/shapesdemo/ShapesDemo.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS ShapesDemo is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -53,7 +53,7 @@ bool ShapesDemo::init() { cout <<"Creating new RTPSParticipant"< diff --git a/utils/doxygen/doxycodeexamples/pubsub_example.cpp b/utils/doxygen/doxycodeexamples/pubsub_example.cpp index 4dc58962299..c0ba4d73e40 100644 --- a/utils/doxygen/doxycodeexamples/pubsub_example.cpp +++ b/utils/doxygen/doxycodeexamples/pubsub_example.cpp @@ -1,8 +1,8 @@ /************************************************************************* * Copyright (c) 2013 eProsima. All rights reserved. * - * This copy of eProsimaRTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * This copy of fastrtps is licensed to you under the terms described in the + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/doxygen/doxycodeexamples/rtps_example.cpp b/utils/doxygen/doxycodeexamples/rtps_example.cpp index 0b227c29617..37572dddd4b 100644 --- a/utils/doxygen/doxycodeexamples/rtps_example.cpp +++ b/utils/doxygen/doxycodeexamples/rtps_example.cpp @@ -1,8 +1,8 @@ /************************************************************************* * Copyright (c) 2013 eProsima. All rights reserved. * - * This copy of eProsimaRTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * This copy of fastrtps is licensed to you under the terms described in the + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/doxygen/doxyfile b/utils/doxygen/doxyfile index 66d483ea78e..1b3ee16d466 100644 --- a/utils/doxygen/doxyfile +++ b/utils/doxygen/doxyfile @@ -667,7 +667,7 @@ WARN_LOGFILE = # with spaces. INPUT = utils/doxygen/doxygenfiles \ - include/eprosimartps + include/fastrtps # This tag can be used to specify the character encoding of the source files diff --git a/utils/doxygen/doxyfile_complete_api b/utils/doxygen/doxyfile_complete_api index 6049249e932..6d130c33a77 100644 --- a/utils/doxygen/doxyfile_complete_api +++ b/utils/doxygen/doxyfile_complete_api @@ -667,7 +667,7 @@ WARN_LOGFILE = # with spaces. INPUT = utils/doxygen/doxygenfiles \ - include/eprosimartps + include/fastrtps # This tag can be used to specify the character encoding of the source files diff --git a/utils/doxygen/doxyfile_public_api b/utils/doxygen/doxyfile_public_api index 874b98644b0..918ce372bcc 100644 --- a/utils/doxygen/doxyfile_public_api +++ b/utils/doxygen/doxyfile_public_api @@ -753,7 +753,7 @@ WARN_LOGFILE = # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = ../../include/eprosimartps \ +INPUT = ../../include/fastrtps \ doxygenfiles/mainpage.dox # This tag can be used to specify the character encoding of the source files diff --git a/utils/installers/ertps/linux/Makefile.am b/utils/installers/ertps/linux/Makefile.am index 9a2f946b79c..9777079779d 100644 --- a/utils/installers/ertps/linux/Makefile.am +++ b/utils/installers/ertps/linux/Makefile.am @@ -1,28 +1,28 @@ SUBDIRS = include -lib_LTLIBRARIES = libeprosimartps.la -libeprosimartps_la_SOURCES = EPROSIMARTPS_SOURCES +lib_LTLIBRARIES = libfastrtps.la +libfastrtps_la_SOURCES = fastrtps_SOURCES -libeprosimartps_la_LDFLAGS = -version-number VERSION_MAJOR:VERSION_MINOR:VERSION_RELEASE $(BOOST_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) -lboost_system -lboost_thread +libfastrtps_la_LDFLAGS = -version-number VERSION_MAJOR:VERSION_MINOR:VERSION_RELEASE $(BOOST_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) -lboost_system -lboost_thread -AM_CPPFLAGS = -std=c++0x -Iinclude -Iinclude/eprosimartps $(BOOST_CPPFLAGS) +AM_CPPFLAGS = -std=c++0x -Iinclude -Iinclude/fastrtps $(BOOST_CPPFLAGS) ACLOCAL_AMFLAGS = -I m4 -#eprosimartps_licenciasdir = $(datadir)/doc/licenses -#eprosimartps_licencias_DATA = EPROSIMARTPS_LICENSE.txt LGPLv3_LICENSE.txt +#fastrtps_licenciasdir = $(datadir)/doc/licenses +#fastrtps_licencias_DATA = fastrtps_LICENSE.txt LGPLv3_LICENSE.txt install-data-hook: - mkdir -p $(DESTDIR)$(datadir)/doc/eprosimartps; \ - cp -r doc/* $(DESTDIR)$(datadir)/doc/eprosimartps; \ - cp -r README.html $(DESTDIR)$(datadir)/doc/eprosimartps; \ - cp -r EPROSIMARTPS_LIBRARY_LICENSE.txt $(DESTDIR)$(datadir)/doc/eprosimartps; \ - cp -r LGPLv3_LICENSE.txt $(DESTDIR)$(datadir)/doc/eprosimartps; \ - mkdir -p $(DESTDIR)$(datadir)/eprosimartps; \ - cp -r examples $(DESTDIR)$(datadir)/eprosimartps/; + mkdir -p $(DESTDIR)$(datadir)/doc/fastrtps; \ + cp -r doc/* $(DESTDIR)$(datadir)/doc/fastrtps; \ + cp -r README.html $(DESTDIR)$(datadir)/doc/fastrtps; \ + cp -r fastrtps_LIBRARY_LICENSE.txt $(DESTDIR)$(datadir)/doc/fastrtps; \ + cp -r LGPLv3_LICENSE.txt $(DESTDIR)$(datadir)/doc/fastrtps; \ + mkdir -p $(DESTDIR)$(datadir)/fastrtps; \ + cp -r examples $(DESTDIR)$(datadir)/fastrtps/; mkdir -p $(DESTDIR)$(datadir)/rtpsgen; \ - cp -r rtpsgen $(DESTDIR)$(datadir)/eprosimartps/; + cp -r rtpsgen $(DESTDIR)$(datadir)/fastrtps/; uninstall-hook: - rm -r $(DESTDIR)$(datadir)/doc/eprosimartps; \ - rm -r $(DESTDIR)$(datadir)/eprosimartps; \ - rm -r $(DESTDIR)$(datadir)/include/eprosimartps + rm -r $(DESTDIR)$(datadir)/doc/fastrtps; \ + rm -r $(DESTDIR)$(datadir)/fastrtps; \ + rm -r $(DESTDIR)$(datadir)/include/fastrtps diff --git a/utils/installers/ertps/linux/configure.ac b/utils/installers/ertps/linux/configure.ac index cea24b62cd8..c421264eddd 100644 --- a/utils/installers/ertps/linux/configure.ac +++ b/utils/installers/ertps/linux/configure.ac @@ -2,7 +2,7 @@ m4_define([version_major],[0]) m4_define([version_minor],[5]) m4_define([version_micro],[1]) -AC_INIT([eprosimartps], [VERSION], [support@eprosima.com], [eprosimartps], [http://eprosima.com/]) +AC_INIT([fastrtps], [VERSION], [support@eprosima.com], [fastrtps], [http://eprosima.com/]) AC_PREREQ([2.59]) AM_INIT_AUTOMAKE([1.10 no-define foreign]): AC_PROG_CXX diff --git a/utils/installers/ertps/linux/setup_linux.sh b/utils/installers/ertps/linux/setup_linux.sh index 5ae45effd14..d6214704e92 100755 --- a/utils/installers/ertps/linux/setup_linux.sh +++ b/utils/installers/ertps/linux/setup_linux.sh @@ -13,13 +13,13 @@ # To create RPM in CentOs you have to follow this link: # http://wiki.centos.org/HowTos/SetupRpmBuildEnvironment -project="eprosimartps" +project="fastrtps" installer() { # Copy licenses. - cp ../../../../doc/licenses/EPROSIMARTPS_LIBRARY_LICENSE.txt tmp/$project + cp ../../../../doc/licenses/fastrtps_LIBRARY_LICENSE.txt tmp/$project errorstatus=$? if [ $errorstatus != 0 ]; then return; fi cp ../../../../doc/licenses/LGPLv3_LICENSE.txt tmp/$project @@ -79,24 +79,24 @@ installer() errorstatus=$? if [ $errorstatus != 0 ]; then return; fi - # eProsimaRTPS headers + # fastrtps headers mkdir -p tmp/$project/include - cp -r ../../../../include/eprosimartps tmp/$project/include + cp -r ../../../../include/fastrtps tmp/$project/include errorstatus=$? if [ $errorstatus != 0 ]; then return; fi # Copy eProsima header files - mkdir -p tmp/$project/include/eprosimartps/eProsima_cpp - cp ../../../../thirdparty/eprosima-common-code/eProsima_cpp/config/eProsima_auto_link.h tmp/$project/include/eprosimartps/eProsima_cpp + mkdir -p tmp/$project/include/fastrtps/eProsima_cpp + cp ../../../../thirdparty/eprosima-common-code/eProsima_cpp/config/eProsima_auto_link.h tmp/$project/include/fastrtps/eProsima_cpp errorstatus=$? if [ $errorstatus != 0 ]; then return; fi - cp ../../../../thirdparty/eprosima-common-code/eProsima_cpp/config/eProsimaMacros.h tmp/$project/include/eprosimartps/eProsima_cpp + cp ../../../../thirdparty/eprosima-common-code/eProsima_cpp/config/eProsimaMacros.h tmp/$project/include/fastrtps/eProsima_cpp errorstatus=$? if [ $errorstatus != 0 ]; then return; fi - # Copy eProsimaRTPS sources + # Copy fastrtps sources cd ../../../.. - cp --parents `cat building/makefiles/eprosimartps_sources` utils/installers/ertps/linux/tmp/$project + cp --parents `cat building/makefiles/fastrtps_sources` utils/installers/ertps/linux/tmp/$project errorstatus=$? if [ $errorstatus != 0 ]; then return; fi mkdir -p utils/installers/ertps/linux/tmp/$project/src/cpp/submessages/ @@ -130,13 +130,13 @@ installer() sed -i "s/VERSION_RELEASE/`echo ${version} | cut -d. -f3`/g" Makefile.am errorstatus=$? if [ $errorstatus != 0 ]; then return; fi - sourcefiles=$(cat ../../../../../../building/makefiles/eprosimartps_sources | sed -e ':a;N;$!ba;s/\n/ /g') - sed -i -e "s#EPROSIMARTPS_SOURCES#$sourcefiles#" Makefile.am + sourcefiles=$(cat ../../../../../../building/makefiles/fastrtps_sources | sed -e ':a;N;$!ba;s/\n/ /g') + sed -i -e "s#fastrtps_SOURCES#$sourcefiles#" Makefile.am errorstatus=$? if [ $errorstatus != 0 ]; then return; fi - includefiles=$(cat ../../../../../../building/includes/eprosimartps_includes | sed -e 's#^#eprosimartps/#') + includefiles=$(cat ../../../../../../building/includes/fastrtps_includes | sed -e 's#^#fastrtps/#') includefiles=$(echo $includefiles | sed -e ':a;N;$!ba;s/\n/ /g') - #includefiles+=" eprosimartps/eProsima_auto_link.h eprosimartps/eprosimartps_dll.h" + #includefiles+=" fastrtps/eProsima_auto_link.h fastrtps/fastrtps_dll.h" sed -i -e "s#INCLUDE_FILES#$includefiles#" include/Makefile.am errorstatus=$? if [ $errorstatus != 0 ]; then return; fi @@ -149,7 +149,7 @@ installer() find tmp/ -iname "*~" -exec rm -f {} \; cd tmp - tar cvzf "../eprosimartps_${version}-Linux.tar.gz" $project + tar cvzf "../fastrtps_${version}-Linux.tar.gz" $project errorstatus=$? cd .. if [ $errorstatus != 0 ]; then return; fi diff --git a/utils/installers/ertps/windows/EnvVarPage.nsh b/utils/installers/ertps/windows/EnvVarPage.nsh index bf0802fc9a2..a9d7c1d7fa0 100644 --- a/utils/installers/ertps/windows/EnvVarPage.nsh +++ b/utils/installers/ertps/windows/EnvVarPage.nsh @@ -6,8 +6,8 @@ Var FirstTime Var Label -Var CheckboxEPROSIMARTPSHOME -Var CheckboxEPROSIMARTPSHOME_State +Var CheckboxfastrtpsHOME +Var CheckboxfastrtpsHOME_State Var CheckboxScripts Var CheckboxScripts_State @@ -39,14 +39,14 @@ Function VariablesEntornoPage Abort ${EndIf} - ### Creación de los elementos gráficos + ### Creaci�n de los elementos gr�ficos ${NSD_CreateLabel} 0 0 100% 20u "Check the environment variables you want to set and uncheck the environment variables you don't want to set. Click Next to continue." Pop $Label - ${NSD_CreateCheckbox} 10 20u 100% 12u "Set the EPROSIMARTPSHOME environment variable." - Pop $CheckboxEPROSIMARTPSHOME - ${If} $CheckboxEPROSIMARTPSHOME_State == ${BST_CHECKED} - ${NSD_Check} $CheckboxEPROSIMARTPSHOME + ${NSD_CreateCheckbox} 10 20u 100% 12u "Set the fastrtpsHOME environment variable." + Pop $CheckboxfastrtpsHOME + ${If} $CheckboxfastrtpsHOME_State == ${BST_CHECKED} + ${NSD_Check} $CheckboxfastrtpsHOME ${EndIf} ${NSD_CreateCheckbox} 10 32u 100% 12u "&Add to the PATH environment variable the location of eProsima RTPSGEN scripts" @@ -99,17 +99,17 @@ Function VariablesEntornoPage ${NSD_AddStyle} $CheckboxI86_VS2010 ${WS_DISABLED} ${EndIf} - ### La primera vez que lanzamos el instalador, el checkbox de EPROSIMARTPSHOME + ### La primera vez que lanzamos el instalador, el checkbox de fastrtpsHOME ### y el de SCRIPTS deben estar marcados. StrCmp $FirstTime "FirstTime" +5 0 ### Si son iguales las cadenas, GOTO +5, si no, GOTO 0 - ${NSD_Check} $CheckboxEPROSIMARTPSHOME + ${NSD_Check} $CheckboxfastrtpsHOME ${NSD_Check} $CheckboxScripts - ${NSD_GetState} $CheckboxEPROSIMARTPSHOME $CheckboxEPROSIMARTPSHOME_State + ${NSD_GetState} $CheckboxfastrtpsHOME $CheckboxfastrtpsHOME_State ${NSD_GetState} $CheckboxScripts $CheckboxScripts_State StrCpy $FirstTime "FirstTime" ### Fijamos los callbacks para cuando se haga click en los CheckBoxes - ${NSD_OnClick} $CheckboxEPROSIMARTPSHOME ClickEPROSIMARTPSHOME + ${NSD_OnClick} $CheckboxfastrtpsHOME ClickfastrtpsHOME ${NSD_OnClick} $CheckboxScripts ClickScripts ${NSD_OnClick} $CheckboxI86_VS2010 ClickI86_VS2010 ${NSD_OnClick} $CheckboxI86_VS2013 ClickI86_VS2013 @@ -117,10 +117,10 @@ Function VariablesEntornoPage nsDialogs::Show FunctionEnd -### Callback invocado cuando se pulsa el CheckBox EPROSIMARTPSHOME +### Callback invocado cuando se pulsa el CheckBox fastrtpsHOME ### Guardamos el estado en la variable _state -Function ClickEPROSIMARTPSHOME - ${NSD_GetState} $CheckboxEPROSIMARTPSHOME $CheckboxEPROSIMARTPSHOME_State +Function ClickfastrtpsHOME + ${NSD_GetState} $CheckboxfastrtpsHOME $CheckboxfastrtpsHOME_State FunctionEnd ### Callback invocado cuando se pulsa el CheckBox Scripts @@ -131,7 +131,7 @@ FunctionEnd ### Callback invocado cuando se pulsa el CheckBox x64 ### Sirve para deshabilitar el i86, pues no pueden aparecer a la vez -### También guardamos el estado en la variable _state +### Tambi�n guardamos el estado en la variable _state Function ClickX64_VS2010 Pop $CheckboxX64_VS2010 ${NSD_GetState} $CheckboxX64_VS2010 $0 @@ -148,7 +148,7 @@ FunctionEnd ### Callback invocado cuando se pulsa el CheckBox i86 ### Sirve para deshabilitar el x64, pues no pueden aparecer a la vez -### También guardamos el estado en la variable _state +### Tambi�n guardamos el estado en la variable _state Function ClickI86_VS2010 Pop $CheckboxI86_VS2010 ${NSD_GetState} $CheckboxI86_VS2010 $0 @@ -165,7 +165,7 @@ FunctionEnd ### Callback invocado cuando se pulsa el CheckBox x64 VS2013 ### Sirve para deshabilitar el i86 2013, pues no pueden aparecer a la vez -### También guardamos el estado en la variable _state +### Tambi�n guardamos el estado en la variable _state Function ClickX64_VS2013 Pop $CheckboxX64_VS2013 ${NSD_GetState} $CheckboxX64_VS2013 $0 @@ -182,7 +182,7 @@ FunctionEnd ### Callback invocado cuando se pulsa el CheckBox i86 ### Sirve para deshabilitar el x64, pues no pueden aparecer a la vez -### También guardamos el estado en la variable _state +### Tambi�n guardamos el estado en la variable _state Function ClickI86_VS2013 Pop $CheckboxI86_VS2013 ${NSD_GetState} $CheckboxI86_VS2013 $0 diff --git a/utils/installers/ertps/windows/InstallRedistributablesVS2010.nsh b/utils/installers/ertps/windows/InstallRedistributablesVS2010.nsh index c3e57a56d5f..df2a64a58bc 100644 --- a/utils/installers/ertps/windows/InstallRedistributablesVS2010.nsh +++ b/utils/installers/ertps/windows/InstallRedistributablesVS2010.nsh @@ -26,7 +26,7 @@ Function InstallRedistributablesVS2010 StrCmp $I86NeededVS2010 "1" notinstall install install: - messageBox MB_YESNO|MB_ICONQUESTION "eProsimaRTPS needs Visual Studio 2010 Redistributable packages.$\nDo you want to install it?" IDNO notinstall + messageBox MB_YESNO|MB_ICONQUESTION "fastrtps needs Visual Studio 2010 Redistributable packages.$\nDo you want to install it?" IDNO notinstall ${If} $X64NeededVS2010 != "1" ExecWait "$TEMP\vcredist_x64_2010.exe" diff --git a/utils/installers/ertps/windows/InstallRedistributablesVS2013.nsh b/utils/installers/ertps/windows/InstallRedistributablesVS2013.nsh index 63e0197ff61..1d09b929a45 100644 --- a/utils/installers/ertps/windows/InstallRedistributablesVS2013.nsh +++ b/utils/installers/ertps/windows/InstallRedistributablesVS2013.nsh @@ -26,7 +26,7 @@ Function InstallRedistributablesVS2013 StrCmp $I86NeededVS2013 "1" notinstall install install: - messageBox MB_YESNO|MB_ICONQUESTION "eProsimaRTPS needs Visual Studio 2013 Redistributable packages.$\nDo you want to install it?" IDNO notinstall + messageBox MB_YESNO|MB_ICONQUESTION "fastrtps needs Visual Studio 2013 Redistributable packages.$\nDo you want to install it?" IDNO notinstall ${If} $X64NeededVS2013 != "1" ExecWait "$TEMP\vcredist_x64_2013.exe" diff --git a/utils/installers/ertps/windows/setup.nsi b/utils/installers/ertps/windows/setup.nsi index 46d4005b83c..54efbca3d1c 100644 --- a/utils/installers/ertps/windows/setup.nsi +++ b/utils/installers/ertps/windows/setup.nsi @@ -112,7 +112,7 @@ Var StartMenuGroup ReserveFile "${NSISDIR}\Plugins\newadvsplash.dll" # Installer pages !insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE ..\..\..\..\doc\licenses\EPROSIMARTPS_LIBRARY_LICENSE.txt +!insertmacro MUI_PAGE_LICENSE ..\..\..\..\doc\licenses\fastrtps_LIBRARY_LICENSE.txt !insertmacro MUI_PAGE_STARTMENU Application $StartMenuGroup !define MUI_PAGE_CUSTOMFUNCTION_LEAVE ComponentsPageLeave !insertmacro MUI_PAGE_COMPONENTS @@ -255,8 +255,8 @@ Section -post SEC0006 WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1 ### Actualizamos las variables de entorno que se hayan marcado - ${If} $CheckboxEPROSIMARTPSHOME_State == ${BST_CHECKED} - ${EnvVarUpdate} $0 "EPROSIMARTPSHOME" "P" "HKLM" "$INSTDIR" + ${If} $CheckboxfastrtpsHOME_State == ${BST_CHECKED} + ${EnvVarUpdate} $0 "fastrtpsHOME" "P" "HKLM" "$INSTDIR" WriteRegStr HKLM "${REGKEY}\Components" "FASTRPCHOME" 1 ${EndIf} ${If} $CheckboxScripts_State == ${BST_CHECKED} @@ -354,9 +354,9 @@ Section -un.post UNSEC0006 DeleteRegValue HKLM "${REGKEY}\Components" "i86 VS2013 libraries location" DeleteRegValue HKLM "${REGKEY}\Components" "x64 VS2013 libraries location" DeleteRegValue HKLM "${REGKEY}\Components" "Script location" - DeleteRegValue HKLM "${REGKEY}\Components" "EPROSIMARTPSHOME" + DeleteRegValue HKLM "${REGKEY}\Components" "fastrtpsHOME" - ${un.EnvVarUpdate} $0 "EPROSIMARTPSHOME" "R" "HKLM" "$INSTDIR" + ${un.EnvVarUpdate} $0 "fastrtpsHOME" "R" "HKLM" "$INSTDIR" ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR\rtpsgen" ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR\lib\x64Win64VS2010" ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR\lib\i86Win32VS2010" diff --git a/utils/pcTests/ClientServerTest/Makefile b/utils/pcTests/ClientServerTest/Makefile index bb42d190e06..4a2a85f0404 100644 --- a/utils/pcTests/ClientServerTest/Makefile +++ b/utils/pcTests/ClientServerTest/Makefile @@ -39,8 +39,8 @@ STATETEST_TARGET= $(BASEDIR)/bin/$(EPROSIMA_TARGET)/ClientServer STATETEST_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/../../../include \ -I$(EPROSIMADIR)/code -STATETEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartpsd -lboost_system -lboost_thread -lthrift -STATETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartps -lboost_system -lboost_thread -lthrift +STATETEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtpsd -lboost_system -lboost_thread -lthrift +STATETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtps -lboost_system -lboost_thread -lthrift STATETEST_SRC_CFILES= diff --git a/utils/pcTests/ClientServerTest/apache/ApacheClientTest.h b/utils/pcTests/ClientServerTest/apache/ApacheClientTest.h index 012572f068b..5903cdb9299 100644 --- a/utils/pcTests/ClientServerTest/apache/ApacheClientTest.h +++ b/utils/pcTests/ClientServerTest/apache/ApacheClientTest.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef APACHECLIENTTEST_H_ #define APACHECLIENTTEST_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" class ApacheClientTest { diff --git a/utils/pcTests/ClientServerTest/apache/ApacheServer.h b/utils/pcTests/ClientServerTest/apache/ApacheServer.h index 4639329b7f7..ce1f6063db5 100644 --- a/utils/pcTests/ClientServerTest/apache/ApacheServer.h +++ b/utils/pcTests/ClientServerTest/apache/ApacheServer.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/ClientServerTest/eprosima/ClientServerTypes.cpp b/utils/pcTests/ClientServerTest/eprosima/ClientServerTypes.cpp index 507e713809d..f46c7947a43 100644 --- a/utils/pcTests/ClientServerTest/eprosima/ClientServerTypes.cpp +++ b/utils/pcTests/ClientServerTest/eprosima/ClientServerTypes.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/ClientServerTest/eprosima/ClientServerTypes.h b/utils/pcTests/ClientServerTest/eprosima/ClientServerTypes.h index 77fde502149..41f6771d4b4 100644 --- a/utils/pcTests/ClientServerTest/eprosima/ClientServerTypes.h +++ b/utils/pcTests/ClientServerTest/eprosima/ClientServerTypes.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef CLIENTSERVERTYPES_H_ #define CLIENTSERVERTYPES_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" namespace clientserver{ diff --git a/utils/pcTests/ClientServerTest/eprosima/EprosimaClient.cpp b/utils/pcTests/ClientServerTest/eprosima/EprosimaClient.cpp index dfe84743881..d93b3b371df 100644 --- a/utils/pcTests/ClientServerTest/eprosima/EprosimaClient.cpp +++ b/utils/pcTests/ClientServerTest/eprosima/EprosimaClient.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/ClientServerTest/eprosima/EprosimaClient.h b/utils/pcTests/ClientServerTest/eprosima/EprosimaClient.h index 7a8feecee4a..24f31b2ebdd 100644 --- a/utils/pcTests/ClientServerTest/eprosima/EprosimaClient.h +++ b/utils/pcTests/ClientServerTest/eprosima/EprosimaClient.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef EPROSIMACLIENT_H_ #define EPROSIMACLIENT_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "ClientServerTypes.h" using namespace clientserver; diff --git a/utils/pcTests/ClientServerTest/eprosima/EprosimaClientTest.cpp b/utils/pcTests/ClientServerTest/eprosima/EprosimaClientTest.cpp index ff201e5babe..edab925f259 100644 --- a/utils/pcTests/ClientServerTest/eprosima/EprosimaClientTest.cpp +++ b/utils/pcTests/ClientServerTest/eprosima/EprosimaClientTest.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/ClientServerTest/eprosima/EprosimaClientTest.h b/utils/pcTests/ClientServerTest/eprosima/EprosimaClientTest.h index c7261f4260a..844b17ff40e 100644 --- a/utils/pcTests/ClientServerTest/eprosima/EprosimaClientTest.h +++ b/utils/pcTests/ClientServerTest/eprosima/EprosimaClientTest.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/ClientServerTest/eprosima/EprosimaServer.cpp b/utils/pcTests/ClientServerTest/eprosima/EprosimaServer.cpp index b0501c62d5c..c0976edb9e6 100644 --- a/utils/pcTests/ClientServerTest/eprosima/EprosimaServer.cpp +++ b/utils/pcTests/ClientServerTest/eprosima/EprosimaServer.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/ClientServerTest/eprosima/EprosimaServer.h b/utils/pcTests/ClientServerTest/eprosima/EprosimaServer.h index 450be003099..e91c9b30a24 100644 --- a/utils/pcTests/ClientServerTest/eprosima/EprosimaServer.h +++ b/utils/pcTests/ClientServerTest/eprosima/EprosimaServer.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef EPROSIMASERVER_H_ #define EPROSIMASERVER_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "ClientServerTypes.h" using namespace clientserver; diff --git a/utils/pcTests/ClientServerTest/main_ClientServerTest.cpp b/utils/pcTests/ClientServerTest/main_ClientServerTest.cpp index 928beaa3165..c5bf0ef8607 100644 --- a/utils/pcTests/ClientServerTest/main_ClientServerTest.cpp +++ b/utils/pcTests/ClientServerTest/main_ClientServerTest.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -21,7 +21,7 @@ #include #include -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "eprosima/EprosimaServer.h" #include "eprosima/EprosimaClientTest.h" diff --git a/utils/pcTests/DiscoveryTest/DiscoveryTest.cpp b/utils/pcTests/DiscoveryTest/DiscoveryTest.cpp index ab6b8602ada..95b4544b6d9 100644 --- a/utils/pcTests/DiscoveryTest/DiscoveryTest.cpp +++ b/utils/pcTests/DiscoveryTest/DiscoveryTest.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2013 eProsima. All rights reserved. * * This copy of FastCdr is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,13 +14,13 @@ #include #include // -#include "eprosimartps/dds/DomainRTPSParticipant.h" -#include "eprosimartps/RTPSParticipant.h" -#include "eprosimartps/dds/Publisher.h" -#include "eprosimartps/dds/Subscriber.h" -#include "eprosimartps/common/colors.h" -#include "eprosimartps/qos/ParameterList.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/dds/DomainRTPSParticipant.h" +#include "fastrtps/RTPSParticipant.h" +#include "fastrtps/dds/Publisher.h" +#include "fastrtps/dds/Subscriber.h" +#include "fastrtps/common/colors.h" +#include "fastrtps/qos/ParameterList.h" +#include "fastrtps/utils/RTPSLog.h" #include "boost/date_time/posix_time/posix_time.hpp" diff --git a/utils/pcTests/DiscoveryTest/DiscoveryTest_win.cpp b/utils/pcTests/DiscoveryTest/DiscoveryTest_win.cpp index c6b6afd3449..30b59ac27f2 100644 --- a/utils/pcTests/DiscoveryTest/DiscoveryTest_win.cpp +++ b/utils/pcTests/DiscoveryTest/DiscoveryTest_win.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2013 eProsima. All rights reserved. * * This copy of FastCdr is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -18,13 +18,13 @@ #include #include // -#include "eprosimartps/dds/DomainRTPSParticipant.h" -#include "eprosimartps/RTPSParticipant.h" -#include "eprosimartps/dds/Publisher.h" -#include "eprosimartps/dds/Subscriber.h" -#include "eprosimartps/common/colors.h" -#include "eprosimartps/qos/ParameterList.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/dds/DomainRTPSParticipant.h" +#include "fastrtps/RTPSParticipant.h" +#include "fastrtps/dds/Publisher.h" +#include "fastrtps/dds/Subscriber.h" +#include "fastrtps/common/colors.h" +#include "fastrtps/qos/ParameterList.h" +#include "fastrtps/utils/RTPSLog.h" #include "boost/date_time/posix_time/posix_time.hpp" diff --git a/utils/pcTests/DiscoveryTest/Makefile b/utils/pcTests/DiscoveryTest/Makefile index e32f7d00c55..c7643e9f284 100644 --- a/utils/pcTests/DiscoveryTest/Makefile +++ b/utils/pcTests/DiscoveryTest/Makefile @@ -24,8 +24,8 @@ DISCOVERYTEST_TARGET= $(BASEDIR)/bin/$(EPROSIMA_TARGET)/DiscoveryTest DISCOVERYTEST_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/../../../include \ -I$(EPROSIMADIR)/code -DISCOVERYTEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartpsd -lboost_system -lboost_thread -DISCOVERYTEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartps -lboost_system -lboost_thread +DISCOVERYTEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtpsd -lboost_system -lboost_thread +DISCOVERYTEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtps -lboost_system -lboost_thread DISCOVERYTEST_SRC_CFILES= diff --git a/utils/pcTests/FastBufferTest/HelloWorldPublisher.cpp b/utils/pcTests/FastBufferTest/HelloWorldPublisher.cpp index 71c31227c7e..83a13ac78fc 100644 --- a/utils/pcTests/FastBufferTest/HelloWorldPublisher.cpp +++ b/utils/pcTests/FastBufferTest/HelloWorldPublisher.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/FastBufferTest/HelloWorldPublisher.h b/utils/pcTests/FastBufferTest/HelloWorldPublisher.h index 46b24137bef..467913a2749 100644 --- a/utils/pcTests/FastBufferTest/HelloWorldPublisher.h +++ b/utils/pcTests/FastBufferTest/HelloWorldPublisher.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef HELLOWORLDPUBLISHER_H_ #define HELLOWORLDPUBLISHER_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "HelloWorld.h" class HelloWorldPublisher { diff --git a/utils/pcTests/FastBufferTest/HelloWorldSubscriber.cpp b/utils/pcTests/FastBufferTest/HelloWorldSubscriber.cpp index 86daa10c3a3..72bf4ee5f52 100644 --- a/utils/pcTests/FastBufferTest/HelloWorldSubscriber.cpp +++ b/utils/pcTests/FastBufferTest/HelloWorldSubscriber.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/FastBufferTest/HelloWorldSubscriber.h b/utils/pcTests/FastBufferTest/HelloWorldSubscriber.h index c50b4037242..956dccdd268 100644 --- a/utils/pcTests/FastBufferTest/HelloWorldSubscriber.h +++ b/utils/pcTests/FastBufferTest/HelloWorldSubscriber.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef HELLOWORLDSUBSCRIBER_H_ #define HELLOWORLDSUBSCRIBER_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "HelloWorld.h" class HelloWorldSubscriber { diff --git a/utils/pcTests/FastBufferTest/HelloWorldType.cpp b/utils/pcTests/FastBufferTest/HelloWorldType.cpp index d3789df4a5c..c6dc9a2434f 100644 --- a/utils/pcTests/FastBufferTest/HelloWorldType.cpp +++ b/utils/pcTests/FastBufferTest/HelloWorldType.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/FastBufferTest/HelloWorldType.h b/utils/pcTests/FastBufferTest/HelloWorldType.h index d0905bf8526..c4606693456 100644 --- a/utils/pcTests/FastBufferTest/HelloWorldType.h +++ b/utils/pcTests/FastBufferTest/HelloWorldType.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef HELLOWORLDTYPE_H_ #define HELLOWORLDTYPE_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" class HelloWorldType:public DDSTopicDataType { diff --git a/utils/pcTests/FastBufferTest/HelloWorld_main.cpp b/utils/pcTests/FastBufferTest/HelloWorld_main.cpp index 7cc167360fc..00301731aa8 100644 --- a/utils/pcTests/FastBufferTest/HelloWorld_main.cpp +++ b/utils/pcTests/FastBufferTest/HelloWorld_main.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,7 +11,7 @@ * */ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "HelloWorldPublisher.h" #include "HelloWorldSubscriber.h" #include "HelloWorldType.h" diff --git a/utils/pcTests/FastBufferTest/Makefile b/utils/pcTests/FastBufferTest/Makefile index 099921cbd74..c27c183f2a5 100644 --- a/utils/pcTests/FastBufferTest/Makefile +++ b/utils/pcTests/FastBufferTest/Makefile @@ -27,9 +27,9 @@ HELLOWORLDTEST_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/../../../include \ -I$(EPROSIMADIR)/code \ -I$(FASTCDR_DIR)/include -HELLOWORLDTEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartpsd -lboost_system -lboost_thread \ +HELLOWORLDTEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtpsd -lboost_system -lboost_thread \ -L$(FASTCDR_DIR)/lib/$(EPROSIMA_TARGET) -lfastcdrd -HELLOWORLDTEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartps -lboost_system -lboost_thread \ +HELLOWORLDTEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtps -lboost_system -lboost_thread \ -L$(FASTCDR_DIR)/lib/$(EPROSIMA_TARGET) -lfastcdrd HELLOWORLDTEST_SRC_CFILES= diff --git a/utils/pcTests/FastBufferTest/ReliableCommunicationTest.cpp b/utils/pcTests/FastBufferTest/ReliableCommunicationTest.cpp index ac6b61fdfb3..3b463fb980d 100644 --- a/utils/pcTests/FastBufferTest/ReliableCommunicationTest.cpp +++ b/utils/pcTests/FastBufferTest/ReliableCommunicationTest.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,13 +15,13 @@ #include #include -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" -//#include "eprosimartps/dds/DomainRTPSParticipant.h" -//#include "eprosimartps/RTPSParticipant.h" +//#include "fastrtps/dds/DomainRTPSParticipant.h" +//#include "fastrtps/RTPSParticipant.h" // -//#include "eprosimartps/qos/ParameterList.h" -//#include "eprosimartps/utils/RTPSLog.h" +//#include "fastrtps/qos/ParameterList.h" +//#include "fastrtps/utils/RTPSLog.h" diff --git a/utils/pcTests/FullDiscoveryTest/FullDiscoveryTest.cpp b/utils/pcTests/FullDiscoveryTest/FullDiscoveryTest.cpp index ae9ad9ae8cc..90c785abbb6 100644 --- a/utils/pcTests/FullDiscoveryTest/FullDiscoveryTest.cpp +++ b/utils/pcTests/FullDiscoveryTest/FullDiscoveryTest.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2013 eProsima. All rights reserved. * * This copy of FastCdr is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -22,22 +22,22 @@ #include #include // -//#include "eprosimartps/dds/DomainRTPSParticipant.h" -//#include "eprosimartps/RTPSParticipant.h" -//#include "eprosimartps/dds/Publisher.h" -//#include "eprosimartps/dds/Subscriber.h" -//#include "eprosimartps/dds/attributes/all_attributes.h" -//#include "eprosimartps/qos/ParameterList.h" -//#include "eprosimartps/qos/DDSQosPolicies.h" -//#include "eprosimartps/utils/RTPSLog.h" -//#include "eprosimartps/dds/DDSTopicDataType.h" +//#include "fastrtps/dds/DomainRTPSParticipant.h" +//#include "fastrtps/RTPSParticipant.h" +//#include "fastrtps/dds/Publisher.h" +//#include "fastrtps/dds/Subscriber.h" +//#include "fastrtps/dds/attributes/all_attributes.h" +//#include "fastrtps/qos/ParameterList.h" +//#include "fastrtps/qos/DDSQosPolicies.h" +//#include "fastrtps/utils/RTPSLog.h" +//#include "fastrtps/dds/DDSTopicDataType.h" // -//#include "eprosimartps/dds/PublisherListener.h" -//#include "eprosimartps/dds/SubscriberListener.h" +//#include "fastrtps/dds/PublisherListener.h" +//#include "fastrtps/dds/SubscriberListener.h" // -//#include "eprosimartps/dds/SampleInfo.h" +//#include "fastrtps/dds/SampleInfo.h" -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "boost/date_time/posix_time/posix_time.hpp" #include "boost/date_time/gregorian/gregorian.hpp" diff --git a/utils/pcTests/FullDiscoveryTest/FullDiscoveryTest_win.cpp b/utils/pcTests/FullDiscoveryTest/FullDiscoveryTest_win.cpp index 93edbd73d26..7135b4cd105 100644 --- a/utils/pcTests/FullDiscoveryTest/FullDiscoveryTest_win.cpp +++ b/utils/pcTests/FullDiscoveryTest/FullDiscoveryTest_win.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2013 eProsima. All rights reserved. * * This copy of FastCdr is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -22,13 +22,13 @@ #include #include // -#include "eprosimartps/dds/DomainRTPSParticipant.h" -#include "eprosimartps/RTPSParticipant.h" -#include "eprosimartps/dds/Publisher.h" -#include "eprosimartps/dds/Subscriber.h" -#include "eprosimartps/common/colors.h" -#include "eprosimartps/qos/ParameterList.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/dds/DomainRTPSParticipant.h" +#include "fastrtps/RTPSParticipant.h" +#include "fastrtps/dds/Publisher.h" +#include "fastrtps/dds/Subscriber.h" +#include "fastrtps/common/colors.h" +#include "fastrtps/qos/ParameterList.h" +#include "fastrtps/utils/RTPSLog.h" #include "boost/date_time/posix_time/posix_time.hpp" diff --git a/utils/pcTests/FullDiscoveryTest/Makefile b/utils/pcTests/FullDiscoveryTest/Makefile index 25712b87e32..e8c87abf77e 100644 --- a/utils/pcTests/FullDiscoveryTest/Makefile +++ b/utils/pcTests/FullDiscoveryTest/Makefile @@ -24,8 +24,8 @@ DISCOVERYTEST_TARGET= $(BASEDIR)/bin/$(EPROSIMA_TARGET)/DiscoveryTest DISCOVERYTEST_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/../../../include \ -I$(EPROSIMADIR)/code -DISCOVERYTEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartpsd -lboost_system -lboost_thread -DISCOVERYTEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartps -lboost_system -lboost_thread +DISCOVERYTEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtpsd -lboost_system -lboost_thread +DISCOVERYTEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtps -lboost_system -lboost_thread DISCOVERYTEST_SRC_CFILES= diff --git a/utils/pcTests/HelloWorldTest/HelloWorldPublisher.cpp b/utils/pcTests/HelloWorldTest/HelloWorldPublisher.cpp index 71c31227c7e..83a13ac78fc 100644 --- a/utils/pcTests/HelloWorldTest/HelloWorldPublisher.cpp +++ b/utils/pcTests/HelloWorldTest/HelloWorldPublisher.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/HelloWorldTest/HelloWorldPublisher.h b/utils/pcTests/HelloWorldTest/HelloWorldPublisher.h index 46b24137bef..467913a2749 100644 --- a/utils/pcTests/HelloWorldTest/HelloWorldPublisher.h +++ b/utils/pcTests/HelloWorldTest/HelloWorldPublisher.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef HELLOWORLDPUBLISHER_H_ #define HELLOWORLDPUBLISHER_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "HelloWorld.h" class HelloWorldPublisher { diff --git a/utils/pcTests/HelloWorldTest/HelloWorldSubscriber.cpp b/utils/pcTests/HelloWorldTest/HelloWorldSubscriber.cpp index 86daa10c3a3..72bf4ee5f52 100644 --- a/utils/pcTests/HelloWorldTest/HelloWorldSubscriber.cpp +++ b/utils/pcTests/HelloWorldTest/HelloWorldSubscriber.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/HelloWorldTest/HelloWorldSubscriber.h b/utils/pcTests/HelloWorldTest/HelloWorldSubscriber.h index c50b4037242..956dccdd268 100644 --- a/utils/pcTests/HelloWorldTest/HelloWorldSubscriber.h +++ b/utils/pcTests/HelloWorldTest/HelloWorldSubscriber.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef HELLOWORLDSUBSCRIBER_H_ #define HELLOWORLDSUBSCRIBER_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "HelloWorld.h" class HelloWorldSubscriber { diff --git a/utils/pcTests/HelloWorldTest/HelloWorldType.cpp b/utils/pcTests/HelloWorldTest/HelloWorldType.cpp index d3789df4a5c..c6dc9a2434f 100644 --- a/utils/pcTests/HelloWorldTest/HelloWorldType.cpp +++ b/utils/pcTests/HelloWorldTest/HelloWorldType.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/HelloWorldTest/HelloWorldType.h b/utils/pcTests/HelloWorldTest/HelloWorldType.h index d0905bf8526..c4606693456 100644 --- a/utils/pcTests/HelloWorldTest/HelloWorldType.h +++ b/utils/pcTests/HelloWorldTest/HelloWorldType.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef HELLOWORLDTYPE_H_ #define HELLOWORLDTYPE_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" class HelloWorldType:public DDSTopicDataType { diff --git a/utils/pcTests/HelloWorldTest/HelloWorld_main.cpp b/utils/pcTests/HelloWorldTest/HelloWorld_main.cpp index 7cc167360fc..00301731aa8 100644 --- a/utils/pcTests/HelloWorldTest/HelloWorld_main.cpp +++ b/utils/pcTests/HelloWorldTest/HelloWorld_main.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,7 +11,7 @@ * */ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "HelloWorldPublisher.h" #include "HelloWorldSubscriber.h" #include "HelloWorldType.h" diff --git a/utils/pcTests/HelloWorldTest/Makefile b/utils/pcTests/HelloWorldTest/Makefile index d26c5f44b82..4459ac1d2cb 100644 --- a/utils/pcTests/HelloWorldTest/Makefile +++ b/utils/pcTests/HelloWorldTest/Makefile @@ -46,9 +46,9 @@ HELLOWORLDTEST_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/../../../include \ -I$(EPROSIMADIR)/code \ -I$(FASTCDR_DIR)/include -HELLOWORLDTEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartpsd -lboost_system -lboost_thread \ +HELLOWORLDTEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtpsd -lboost_system -lboost_thread \ -L$(FASTCDR_DIR)/lib/$(EPROSIMA_TARGET) -lfastcdrd -HELLOWORLDTEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartps -lboost_system -lboost_thread \ +HELLOWORLDTEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtps -lboost_system -lboost_thread \ -L$(FASTCDR_DIR)/lib/$(EPROSIMA_TARGET) -lfastcdrd HELLOWORLDTEST_SRC_CFILES= diff --git a/utils/pcTests/HelloWorldTest/ReliableCommunicationTest.cpp b/utils/pcTests/HelloWorldTest/ReliableCommunicationTest.cpp index ac6b61fdfb3..3b463fb980d 100644 --- a/utils/pcTests/HelloWorldTest/ReliableCommunicationTest.cpp +++ b/utils/pcTests/HelloWorldTest/ReliableCommunicationTest.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,13 +15,13 @@ #include #include -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" -//#include "eprosimartps/dds/DomainRTPSParticipant.h" -//#include "eprosimartps/RTPSParticipant.h" +//#include "fastrtps/dds/DomainRTPSParticipant.h" +//#include "fastrtps/RTPSParticipant.h" // -//#include "eprosimartps/qos/ParameterList.h" -//#include "eprosimartps/utils/RTPSLog.h" +//#include "fastrtps/qos/ParameterList.h" +//#include "fastrtps/utils/RTPSLog.h" diff --git a/utils/pcTests/LatencyTest/LatencyTestPublisher.cpp b/utils/pcTests/LatencyTest/LatencyTestPublisher.cpp index 3346ca80a0f..e44640415e9 100644 --- a/utils/pcTests/LatencyTest/LatencyTestPublisher.cpp +++ b/utils/pcTests/LatencyTest/LatencyTestPublisher.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/LatencyTest/LatencyTestPublisher.h b/utils/pcTests/LatencyTest/LatencyTestPublisher.h index 2421aaa590c..43367b946a8 100644 --- a/utils/pcTests/LatencyTest/LatencyTestPublisher.h +++ b/utils/pcTests/LatencyTest/LatencyTestPublisher.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/LatencyTest/LatencyTestSubscriber.cpp b/utils/pcTests/LatencyTest/LatencyTestSubscriber.cpp index 46db7555f7f..f14ed948ad3 100644 --- a/utils/pcTests/LatencyTest/LatencyTestSubscriber.cpp +++ b/utils/pcTests/LatencyTest/LatencyTestSubscriber.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/LatencyTest/LatencyTestSubscriber.h b/utils/pcTests/LatencyTest/LatencyTestSubscriber.h index 3faaaf27e26..bb154efeb49 100644 --- a/utils/pcTests/LatencyTest/LatencyTestSubscriber.h +++ b/utils/pcTests/LatencyTest/LatencyTestSubscriber.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/LatencyTest/LatencyTestTypes.cpp b/utils/pcTests/LatencyTest/LatencyTestTypes.cpp index cd117f4c43b..1ef5de5bfdd 100644 --- a/utils/pcTests/LatencyTest/LatencyTestTypes.cpp +++ b/utils/pcTests/LatencyTest/LatencyTestTypes.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/LatencyTest/LatencyTestTypes.h b/utils/pcTests/LatencyTest/LatencyTestTypes.h index e73217ed6ca..62a1de3ec7e 100644 --- a/utils/pcTests/LatencyTest/LatencyTestTypes.h +++ b/utils/pcTests/LatencyTest/LatencyTestTypes.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef LATENCYTESTTYPES_H_ #define LATENCYTESTTYPES_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" diff --git a/utils/pcTests/LatencyTest/Makefile b/utils/pcTests/LatencyTest/Makefile index 5b675206cdb..e232fd6d084 100644 --- a/utils/pcTests/LatencyTest/Makefile +++ b/utils/pcTests/LatencyTest/Makefile @@ -39,8 +39,8 @@ STATETEST_TARGET= $(BASEDIR)/bin/$(EPROSIMA_TARGET)/LatencyTest STATETEST_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/../../../include \ -I$(EPROSIMADIR)/code -STATETEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartpsd -lboost_system -lboost_thread -STATETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartps -lboost_system -lboost_thread +STATETEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtpsd -lboost_system -lboost_thread +STATETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtps -lboost_system -lboost_thread STATETEST_SRC_CFILES= diff --git a/utils/pcTests/LatencyTest/main_LatencyTest.cpp b/utils/pcTests/LatencyTest/main_LatencyTest.cpp index a16054db06b..b0936732579 100644 --- a/utils/pcTests/LatencyTest/main_LatencyTest.cpp +++ b/utils/pcTests/LatencyTest/main_LatencyTest.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2013 eProsima. All rights reserved. * * This copy of FastCdr is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -18,7 +18,7 @@ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "LatencyTestPublisher.h" #include "LatencyTestSubscriber.h" diff --git a/utils/pcTests/NewLogTest/Makefile b/utils/pcTests/NewLogTest/Makefile index 932c0ffe406..39b2b0f9332 100644 --- a/utils/pcTests/NewLogTest/Makefile +++ b/utils/pcTests/NewLogTest/Makefile @@ -38,8 +38,8 @@ RELIABLETEST_TARGET= $(BASEDIR)/bin/$(EPROSIMA_TARGET)/ReliableTest RELIABLETEST_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/../../../include \ -I$(EPROSIMADIR)/code -RELIABLETEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartpsd -lboost_system -lboost_thread -lboost_date_time -RELIABLETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartps -lboost_system -lboost_thread -lboost_date_time +RELIABLETEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtpsd -lboost_system -lboost_thread -lboost_date_time +RELIABLETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtps -lboost_system -lboost_thread -lboost_date_time RELIABLETEST_SRC_CFILES= diff --git a/utils/pcTests/NewLogTest/ReliableCommunicationTest.cpp b/utils/pcTests/NewLogTest/ReliableCommunicationTest.cpp index 476d75f6868..e456584b286 100644 --- a/utils/pcTests/NewLogTest/ReliableCommunicationTest.cpp +++ b/utils/pcTests/NewLogTest/ReliableCommunicationTest.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,9 +15,9 @@ #include #include -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" -#include "eprosimartps/../../thirdparty/eprosima-common-code/eProsima_cpp/log/Log.h" +#include "fastrtps/../../thirdparty/eprosima-common-code/eProsima_cpp/log/Log.h" namespace eprosima{ diff --git a/utils/pcTests/RTIInteroperability/Makefile b/utils/pcTests/RTIInteroperability/Makefile index 560ac8acd3c..afb0078ee2f 100644 --- a/utils/pcTests/RTIInteroperability/Makefile +++ b/utils/pcTests/RTIInteroperability/Makefile @@ -24,8 +24,8 @@ RELIABLETEST_TARGET= $(BASEDIR)/bin/$(EPROSIMA_TARGET)/RTIInteroperability RELIABLETEST_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/../../../include \ -I$(EPROSIMADIR)/code -RELIABLETEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartpsd -lboost_system -lboost_thread -RELIABLETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartps -lboost_system -lboost_thread +RELIABLETEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtpsd -lboost_system -lboost_thread +RELIABLETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtps -lboost_system -lboost_thread RELIABLETEST_SRC_CFILES= diff --git a/utils/pcTests/RTIInteroperability/RTIInteroperability.cpp b/utils/pcTests/RTIInteroperability/RTIInteroperability.cpp index 18a86a5cb90..c757dc4fabb 100644 --- a/utils/pcTests/RTIInteroperability/RTIInteroperability.cpp +++ b/utils/pcTests/RTIInteroperability/RTIInteroperability.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,7 +15,7 @@ #include #include -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" using namespace std; diff --git a/utils/pcTests/ReliableTest/Makefile b/utils/pcTests/ReliableTest/Makefile index fd33e1899de..457d3c0c5ac 100644 --- a/utils/pcTests/ReliableTest/Makefile +++ b/utils/pcTests/ReliableTest/Makefile @@ -38,8 +38,8 @@ RELIABLETEST_TARGET= $(BASEDIR)/bin/$(EPROSIMA_TARGET)/ReliableTest RELIABLETEST_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/../../../include \ -I$(EPROSIMADIR)/code -RELIABLETEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartpsd -lboost_system -lboost_thread -RELIABLETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartps -lboost_system -lboost_thread +RELIABLETEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtpsd -lboost_system -lboost_thread +RELIABLETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtps -lboost_system -lboost_thread RELIABLETEST_SRC_CFILES= diff --git a/utils/pcTests/ReliableTest/ReliableCommunicationTest.cpp b/utils/pcTests/ReliableTest/ReliableCommunicationTest.cpp index ac6b61fdfb3..3b463fb980d 100644 --- a/utils/pcTests/ReliableTest/ReliableCommunicationTest.cpp +++ b/utils/pcTests/ReliableTest/ReliableCommunicationTest.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,13 +15,13 @@ #include #include -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" -//#include "eprosimartps/dds/DomainRTPSParticipant.h" -//#include "eprosimartps/RTPSParticipant.h" +//#include "fastrtps/dds/DomainRTPSParticipant.h" +//#include "fastrtps/RTPSParticipant.h" // -//#include "eprosimartps/qos/ParameterList.h" -//#include "eprosimartps/utils/RTPSLog.h" +//#include "fastrtps/qos/ParameterList.h" +//#include "fastrtps/utils/RTPSLog.h" diff --git a/utils/pcTests/StatefulTest/Makefile b/utils/pcTests/StatefulTest/Makefile index dcf576a14d5..a7b3776d476 100644 --- a/utils/pcTests/StatefulTest/Makefile +++ b/utils/pcTests/StatefulTest/Makefile @@ -24,8 +24,8 @@ STATETEST_TARGET= $(BASEDIR)/bin/$(EPROSIMA_TARGET)/StateTest STATETEST_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/../../../include \ -I$(EPROSIMADIR)/code -STATETEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartpsd -lboost_system -lboost_thread -STATETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartps -lboost_system -lboost_thread +STATETEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtpsd -lboost_system -lboost_thread +STATETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtps -lboost_system -lboost_thread STATETEST_SRC_CFILES= diff --git a/utils/pcTests/StatefulTest/StatefulTest.cpp b/utils/pcTests/StatefulTest/StatefulTest.cpp index ca5dc4b16d4..fb2acdf0c10 100644 --- a/utils/pcTests/StatefulTest/StatefulTest.cpp +++ b/utils/pcTests/StatefulTest/StatefulTest.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2013 eProsima. All rights reserved. * * This copy of FastCdr is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -22,13 +22,13 @@ #include #include -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" -#include "eprosimartps/dds/DomainRTPSParticipant.h" -#include "eprosimartps/RTPSParticipant.h" +#include "fastrtps/dds/DomainRTPSParticipant.h" +#include "fastrtps/RTPSParticipant.h" -#include "eprosimartps/qos/ParameterList.h" -#include "eprosimartps/utils/RTPSLog.h" +#include "fastrtps/qos/ParameterList.h" +#include "fastrtps/utils/RTPSLog.h" #include "boost/date_time/posix_time/posix_time.hpp" #include "boost/date_time/gregorian/gregorian.hpp" diff --git a/utils/pcTests/StatelessTest/Makefile b/utils/pcTests/StatelessTest/Makefile index 98e0abc78a3..f083e251620 100644 --- a/utils/pcTests/StatelessTest/Makefile +++ b/utils/pcTests/StatelessTest/Makefile @@ -24,8 +24,8 @@ STATETEST_TARGET= $(BASEDIR)/bin/$(EPROSIMA_TARGET)/StateTest STATETEST_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/../../../include \ -I$(EPROSIMADIR)/code -STATETEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartpsd -lboost_system -lboost_thread -STATETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartps -lboost_system -lboost_thread +STATETEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtpsd -lboost_system -lboost_thread +STATETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtps -lboost_system -lboost_thread STATETEST_SRC_CFILES= diff --git a/utils/pcTests/StatelessTest/StatelessTest.cpp b/utils/pcTests/StatelessTest/StatelessTest.cpp index 3471ba9b393..1129ceb6b54 100644 --- a/utils/pcTests/StatelessTest/StatelessTest.cpp +++ b/utils/pcTests/StatelessTest/StatelessTest.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2013 eProsima. All rights reserved. * * This copy of FastCdr is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -22,15 +22,15 @@ #include #include -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" -#include "eprosimartps/dds/DomainRTPSParticipant.h" +#include "fastrtps/dds/DomainRTPSParticipant.h" -#include "eprosimartps/qos/ParameterList.h" -#include "eprosimartps/utils/RTPSLog.h" -#include "eprosimartps/dds/DDSTopicDataType.h" -#include "eprosimartps/dds/SubscriberListener.h" -#include "eprosimartps/dds/PublisherListener.h" +#include "fastrtps/qos/ParameterList.h" +#include "fastrtps/utils/RTPSLog.h" +#include "fastrtps/dds/DDSTopicDataType.h" +#include "fastrtps/dds/SubscriberListener.h" +#include "fastrtps/dds/PublisherListener.h" diff --git a/utils/pcTests/ThriftLatency/ApacheClient.h b/utils/pcTests/ThriftLatency/ApacheClient.h index c1a964e7b47..700c731a20a 100755 --- a/utils/pcTests/ThriftLatency/ApacheClient.h +++ b/utils/pcTests/ThriftLatency/ApacheClient.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/ThriftLatency/ApacheServer.h b/utils/pcTests/ThriftLatency/ApacheServer.h index 4639329b7f7..ce1f6063db5 100755 --- a/utils/pcTests/ThriftLatency/ApacheServer.h +++ b/utils/pcTests/ThriftLatency/ApacheServer.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/ThriftLatency/main.cpp b/utils/pcTests/ThriftLatency/main.cpp index 5e13f2a5269..096172bb0bb 100755 --- a/utils/pcTests/ThriftLatency/main.cpp +++ b/utils/pcTests/ThriftLatency/main.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/ThroughputTest/Makefile b/utils/pcTests/ThroughputTest/Makefile index 38b44c7caa6..9942d8b37cf 100644 --- a/utils/pcTests/ThroughputTest/Makefile +++ b/utils/pcTests/ThroughputTest/Makefile @@ -40,8 +40,8 @@ THROUGHPUTTEST_TARGET= $(BASEDIR)/bin/$(EPROSIMA_TARGET)/ThroughputTest THROUGHPUTTEST_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/../../../include \ -I$(EPROSIMADIR)/code -THROUGHPUTTEST_LIBS_DEBUG= -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartpsd -lboost_system -lboost_thread -THROUGHPUTTEST_LIBS_RELEASE= -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartps -lboost_system -lboost_thread +THROUGHPUTTEST_LIBS_DEBUG= -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtpsd -lboost_system -lboost_thread +THROUGHPUTTEST_LIBS_RELEASE= -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtps -lboost_system -lboost_thread THROUGHPUTTEST_SRC_CFILES= diff --git a/utils/pcTests/ThroughputTest/ThroughputPublisher.cpp b/utils/pcTests/ThroughputTest/ThroughputPublisher.cpp index 86589bd9383..9429957174b 100644 --- a/utils/pcTests/ThroughputTest/ThroughputPublisher.cpp +++ b/utils/pcTests/ThroughputTest/ThroughputPublisher.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #include "ThroughputPublisher.h" -#include "eprosimartps/utils/TimeConversion.h" +#include "fastrtps/utils/TimeConversion.h" uint32_t g_dataspub[] = {8,24,56,120,248,504,1016,2040,4088,8184}; //uint32_t dataspub[] = {504,1016,2040,4088,8184}; diff --git a/utils/pcTests/ThroughputTest/ThroughputPublisher.h b/utils/pcTests/ThroughputTest/ThroughputPublisher.h index 1e7b1aaaeca..0e7be233e88 100644 --- a/utils/pcTests/ThroughputTest/ThroughputPublisher.h +++ b/utils/pcTests/ThroughputTest/ThroughputPublisher.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/ThroughputTest/ThroughputSubscriber.cpp b/utils/pcTests/ThroughputTest/ThroughputSubscriber.cpp index 3bba4d2a48c..04eb570e144 100644 --- a/utils/pcTests/ThroughputTest/ThroughputSubscriber.cpp +++ b/utils/pcTests/ThroughputTest/ThroughputSubscriber.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -12,7 +12,7 @@ */ #include "ThroughputSubscriber.h" -#include "eprosimartps/utils/TimeConversion.h" +#include "fastrtps/utils/TimeConversion.h" #include int writecalls= 0; diff --git a/utils/pcTests/ThroughputTest/ThroughputSubscriber.h b/utils/pcTests/ThroughputTest/ThroughputSubscriber.h index 5af28364837..d77e3381969 100644 --- a/utils/pcTests/ThroughputTest/ThroughputSubscriber.h +++ b/utils/pcTests/ThroughputTest/ThroughputSubscriber.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef THROUGHPUTSUBSCRIBER_H_ #define THROUGHPUTSUBSCRIBER_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "ThroughputTypes.h" #include #include diff --git a/utils/pcTests/ThroughputTest/ThroughputTypes.cpp b/utils/pcTests/ThroughputTest/ThroughputTypes.cpp index 00d42773446..d10ea4e8004 100644 --- a/utils/pcTests/ThroughputTest/ThroughputTypes.cpp +++ b/utils/pcTests/ThroughputTest/ThroughputTypes.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/ThroughputTest/ThroughputTypes.h b/utils/pcTests/ThroughputTest/ThroughputTypes.h index 76143402915..41be5f23739 100644 --- a/utils/pcTests/ThroughputTest/ThroughputTypes.h +++ b/utils/pcTests/ThroughputTest/ThroughputTypes.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef THROUGHPUTTYPES_H_ #define THROUGHPUTTYPES_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" //typedef struct TroughputTimeStats{ diff --git a/utils/pcTests/ThroughputTest/main_ThroughputTest.cpp b/utils/pcTests/ThroughputTest/main_ThroughputTest.cpp index f780ae979e4..a4b5aee5920 100644 --- a/utils/pcTests/ThroughputTest/main_ThroughputTest.cpp +++ b/utils/pcTests/ThroughputTest/main_ThroughputTest.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,7 +15,7 @@ #include #include -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "ThroughputTypes.h" diff --git a/utils/pcTests/ThroughputTest_release/Makefile b/utils/pcTests/ThroughputTest_release/Makefile index e441553c59f..50b74eb0e34 100644 --- a/utils/pcTests/ThroughputTest_release/Makefile +++ b/utils/pcTests/ThroughputTest_release/Makefile @@ -40,7 +40,7 @@ THROUGHPUTTEST_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/../../../include \ -I$(EPROSIMADIR)/code -THROUGHPUTTEST_LIBS_RELEASE= -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartps -lboost_system -lboost_thread +THROUGHPUTTEST_LIBS_RELEASE= -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtps -lboost_system -lboost_thread THROUGHPUTTEST_SRC_CFILES= diff --git a/utils/pcTests/ThroughputTest_release/ThroughputPublisher.cpp b/utils/pcTests/ThroughputTest_release/ThroughputPublisher.cpp index 86589bd9383..9429957174b 100644 --- a/utils/pcTests/ThroughputTest_release/ThroughputPublisher.cpp +++ b/utils/pcTests/ThroughputTest_release/ThroughputPublisher.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #include "ThroughputPublisher.h" -#include "eprosimartps/utils/TimeConversion.h" +#include "fastrtps/utils/TimeConversion.h" uint32_t g_dataspub[] = {8,24,56,120,248,504,1016,2040,4088,8184}; //uint32_t dataspub[] = {504,1016,2040,4088,8184}; diff --git a/utils/pcTests/ThroughputTest_release/ThroughputPublisher.h b/utils/pcTests/ThroughputTest_release/ThroughputPublisher.h index 1e7b1aaaeca..0e7be233e88 100644 --- a/utils/pcTests/ThroughputTest_release/ThroughputPublisher.h +++ b/utils/pcTests/ThroughputTest_release/ThroughputPublisher.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/ThroughputTest_release/ThroughputSubscriber.cpp b/utils/pcTests/ThroughputTest_release/ThroughputSubscriber.cpp index 5b42731cd26..feb99255343 100644 --- a/utils/pcTests/ThroughputTest_release/ThroughputSubscriber.cpp +++ b/utils/pcTests/ThroughputTest_release/ThroughputSubscriber.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -12,7 +12,7 @@ */ #include "ThroughputSubscriber.h" -#include "eprosimartps/utils/TimeConversion.h" +#include "fastrtps/utils/TimeConversion.h" #include int writecalls= 0; diff --git a/utils/pcTests/ThroughputTest_release/ThroughputSubscriber.h b/utils/pcTests/ThroughputTest_release/ThroughputSubscriber.h index 5af28364837..d77e3381969 100644 --- a/utils/pcTests/ThroughputTest_release/ThroughputSubscriber.h +++ b/utils/pcTests/ThroughputTest_release/ThroughputSubscriber.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef THROUGHPUTSUBSCRIBER_H_ #define THROUGHPUTSUBSCRIBER_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "ThroughputTypes.h" #include #include diff --git a/utils/pcTests/ThroughputTest_release/ThroughputTest.vcxproj b/utils/pcTests/ThroughputTest_release/ThroughputTest.vcxproj index 1d715389310..c57e271e945 100644 --- a/utils/pcTests/ThroughputTest_release/ThroughputTest.vcxproj +++ b/utils/pcTests/ThroughputTest_release/ThroughputTest.vcxproj @@ -78,11 +78,11 @@ Level3 Disabled BOOST_ALL_DYN_LINK;_MBCS;_DEBUG;%(PreprocessorDefinitions);__LITTLE_ENDIAN__;_WIN32; - $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(EPROSIMARTPSHOME)\include\eprosimartps;$(EPROSIMARTPSHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(fastrtpsHOME)\include\fastrtps;$(fastrtpsHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) true - $(LIB_BOOST_PATH)\stage\lib\x86;$(LIB_BOOST_PATH)\lib\x86;$(EPROSIMARTPSHOME)\lib\i86Win32VS2010;$(ProjectDir)..\..\..\..\lib\i86Win32VS2010;$(LIB_BOOST_PATH)\stage\lib\x86 + $(LIB_BOOST_PATH)\stage\lib\x86;$(LIB_BOOST_PATH)\lib\x86;$(fastrtpsHOME)\lib\i86Win32VS2010;$(ProjectDir)..\..\..\..\lib\i86Win32VS2010;$(LIB_BOOST_PATH)\stage\lib\x86 Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Iphlpapi.lib;%(AdditionalDependencies) Console @@ -92,11 +92,11 @@ Level3 Disabled BOOST_ALL_DYN_LINK;_MBCS;_DEBUG;%(PreprocessorDefinitions);__LITTLE_ENDIAN__;_WIN32; - $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(EPROSIMARTPSHOME)\include\eprosimartps;$(EPROSIMARTPSHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(fastrtpsHOME)\include\fastrtps;$(fastrtpsHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) true - $(EPROSIMARTPSHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\lib\x64;$(LIB_BOOST_PATH)\stage\lib\x64;$(ProjectDir)..\..\..\..\lib\x64Win64VS2010;$(EPROSIMARTPSHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\stage\lib\x64 + $(fastrtpsHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\lib\x64;$(LIB_BOOST_PATH)\stage\lib\x64;$(ProjectDir)..\..\..\..\lib\x64Win64VS2010;$(fastrtpsHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\stage\lib\x64 Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Iphlpapi.lib;%(AdditionalDependencies) Console @@ -107,14 +107,14 @@ MaxSpeed true true - $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(EPROSIMARTPSHOME)\include\eprosimartps;$(EPROSIMARTPSHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(fastrtpsHOME)\include\fastrtps;$(fastrtpsHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) _MBCS;__LITTLE_ENDIAN__;_WIN32;BOOST_ALL_DYN_LINK;%(PreprocessorDefinitions) true true true - $(LIB_BOOST_PATH)\stage\lib\x86;$(LIB_BOOST_PATH)\lib\x86;$(EPROSIMARTPSHOME)\lib\i86Win32VS2010;$(ProjectDir)..\..\..\..\lib\i86Win32VS2010;$(EPROSIMARTPSHOME)\lib\i86Win32VS2010;$(LIB_BOOST_PATH)\stage\lib\x86 + $(LIB_BOOST_PATH)\stage\lib\x86;$(LIB_BOOST_PATH)\lib\x86;$(fastrtpsHOME)\lib\i86Win32VS2010;$(ProjectDir)..\..\..\..\lib\i86Win32VS2010;$(fastrtpsHOME)\lib\i86Win32VS2010;$(LIB_BOOST_PATH)\stage\lib\x86 Console Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Iphlpapi.lib;%(AdditionalDependencies) @@ -125,14 +125,14 @@ MaxSpeed true true - $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(EPROSIMARTPSHOME)\include\eprosimartps;$(EPROSIMARTPSHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(fastrtpsHOME)\include\fastrtps;$(fastrtpsHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) _MBCS;__LITTLE_ENDIAN__;_WIN32;BOOST_ALL_DYN_LINK;%(PreprocessorDefinitions) true true true - $(EPROSIMARTPSHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\lib\x64;$(LIB_BOOST_PATH)\stage\lib\x64;$(ProjectDir)..\..\..\..\lib\x64Win64VS2010;$(EPROSIMARTPSHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\stage\lib\x64 + $(fastrtpsHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\lib\x64;$(LIB_BOOST_PATH)\stage\lib\x64;$(ProjectDir)..\..\..\..\lib\x64Win64VS2010;$(fastrtpsHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\stage\lib\x64 Console Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Iphlpapi.lib;%(AdditionalDependencies) diff --git a/utils/pcTests/ThroughputTest_release/ThroughputTypes.cpp b/utils/pcTests/ThroughputTest_release/ThroughputTypes.cpp index 00d42773446..d10ea4e8004 100644 --- a/utils/pcTests/ThroughputTest_release/ThroughputTypes.cpp +++ b/utils/pcTests/ThroughputTest_release/ThroughputTypes.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/ThroughputTest_release/ThroughputTypes.h b/utils/pcTests/ThroughputTest_release/ThroughputTypes.h index 76143402915..41be5f23739 100644 --- a/utils/pcTests/ThroughputTest_release/ThroughputTypes.h +++ b/utils/pcTests/ThroughputTest_release/ThroughputTypes.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef THROUGHPUTTYPES_H_ #define THROUGHPUTTYPES_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" //typedef struct TroughputTimeStats{ diff --git a/utils/pcTests/ThroughputTest_release/main_ThroughputTest.cpp b/utils/pcTests/ThroughputTest_release/main_ThroughputTest.cpp index ebd82ebf3d3..e0fa954532a 100644 --- a/utils/pcTests/ThroughputTest_release/main_ThroughputTest.cpp +++ b/utils/pcTests/ThroughputTest_release/main_ThroughputTest.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,7 +15,7 @@ #include #include -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "ThroughputTypes.h" diff --git a/utils/pcTests/UpdateAttributesTest/LatencyTestPublisher.cpp b/utils/pcTests/UpdateAttributesTest/LatencyTestPublisher.cpp index ad0a6ef67b7..091633beb51 100644 --- a/utils/pcTests/UpdateAttributesTest/LatencyTestPublisher.cpp +++ b/utils/pcTests/UpdateAttributesTest/LatencyTestPublisher.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/UpdateAttributesTest/LatencyTestPublisher.h b/utils/pcTests/UpdateAttributesTest/LatencyTestPublisher.h index 2421aaa590c..43367b946a8 100644 --- a/utils/pcTests/UpdateAttributesTest/LatencyTestPublisher.h +++ b/utils/pcTests/UpdateAttributesTest/LatencyTestPublisher.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/UpdateAttributesTest/LatencyTestSubscriber.cpp b/utils/pcTests/UpdateAttributesTest/LatencyTestSubscriber.cpp index 46db7555f7f..f14ed948ad3 100644 --- a/utils/pcTests/UpdateAttributesTest/LatencyTestSubscriber.cpp +++ b/utils/pcTests/UpdateAttributesTest/LatencyTestSubscriber.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/UpdateAttributesTest/LatencyTestSubscriber.h b/utils/pcTests/UpdateAttributesTest/LatencyTestSubscriber.h index 3faaaf27e26..bb154efeb49 100644 --- a/utils/pcTests/UpdateAttributesTest/LatencyTestSubscriber.h +++ b/utils/pcTests/UpdateAttributesTest/LatencyTestSubscriber.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/UpdateAttributesTest/LatencyTestTypes.cpp b/utils/pcTests/UpdateAttributesTest/LatencyTestTypes.cpp index cd117f4c43b..1ef5de5bfdd 100644 --- a/utils/pcTests/UpdateAttributesTest/LatencyTestTypes.cpp +++ b/utils/pcTests/UpdateAttributesTest/LatencyTestTypes.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/UpdateAttributesTest/LatencyTestTypes.h b/utils/pcTests/UpdateAttributesTest/LatencyTestTypes.h index e73217ed6ca..62a1de3ec7e 100644 --- a/utils/pcTests/UpdateAttributesTest/LatencyTestTypes.h +++ b/utils/pcTests/UpdateAttributesTest/LatencyTestTypes.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef LATENCYTESTTYPES_H_ #define LATENCYTESTTYPES_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" diff --git a/utils/pcTests/UpdateAttributesTest/Makefile b/utils/pcTests/UpdateAttributesTest/Makefile index f262abb3c8c..281f381bfd0 100644 --- a/utils/pcTests/UpdateAttributesTest/Makefile +++ b/utils/pcTests/UpdateAttributesTest/Makefile @@ -24,8 +24,8 @@ STATETEST_TARGET= $(BASEDIR)/bin/$(EPROSIMA_TARGET)/UpdateAttributes STATETEST_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/../../../include \ -I$(EPROSIMADIR)/code -STATETEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartpsd -lboost_system -lboost_thread -STATETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartps -lboost_system -lboost_thread +STATETEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtpsd -lboost_system -lboost_thread +STATETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtps -lboost_system -lboost_thread STATETEST_SRC_CFILES= diff --git a/utils/pcTests/UpdateAttributesTest/main_UpdateAttributes.cpp b/utils/pcTests/UpdateAttributesTest/main_UpdateAttributes.cpp index e8d68ab920c..a0dc4e40ec0 100644 --- a/utils/pcTests/UpdateAttributesTest/main_UpdateAttributes.cpp +++ b/utils/pcTests/UpdateAttributesTest/main_UpdateAttributes.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2013 eProsima. All rights reserved. * * This copy of FastCdr is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -18,7 +18,7 @@ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "LatencyTestTypes.h" diff --git a/utils/pcTests/ZeroMQTest/Makefile b/utils/pcTests/ZeroMQTest/Makefile index d9b02922d66..75428f240ad 100644 --- a/utils/pcTests/ZeroMQTest/Makefile +++ b/utils/pcTests/ZeroMQTest/Makefile @@ -24,8 +24,8 @@ ZEROMQTEST_TARGET= $(BASEDIR)/bin/$(EPROSIMA_TARGET)/ZeroMQTest ZEROMQTEST_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/../../../include \ -I$(EPROSIMADIR)/code -ZEROMQTEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartpsd -lboost_system -lboost_thread -lzmq -ZEROMQTEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartps -lboost_system -lboost_thread -lzmq +ZEROMQTEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtpsd -lboost_system -lboost_thread -lzmq +ZEROMQTEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtps -lboost_system -lboost_thread -lzmq ZEROMQTEST_SRC_CFILES= diff --git a/utils/pcTests/ZeroMQTest/ZeroMQPublisher.cpp b/utils/pcTests/ZeroMQTest/ZeroMQPublisher.cpp index c47a776e3e1..8e6fe3198a2 100644 --- a/utils/pcTests/ZeroMQTest/ZeroMQPublisher.cpp +++ b/utils/pcTests/ZeroMQTest/ZeroMQPublisher.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/ZeroMQTest/ZeroMQPublisher.h b/utils/pcTests/ZeroMQTest/ZeroMQPublisher.h index b2e3733904a..0ae36af6729 100644 --- a/utils/pcTests/ZeroMQTest/ZeroMQPublisher.h +++ b/utils/pcTests/ZeroMQTest/ZeroMQPublisher.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -16,7 +16,7 @@ #include #include -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" using namespace std; class TimeStats{ diff --git a/utils/pcTests/ZeroMQTest/ZeroMQSubscriber.cpp b/utils/pcTests/ZeroMQTest/ZeroMQSubscriber.cpp index 5e3daa32c24..4650f3645a7 100644 --- a/utils/pcTests/ZeroMQTest/ZeroMQSubscriber.cpp +++ b/utils/pcTests/ZeroMQTest/ZeroMQSubscriber.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/ZeroMQTest/ZeroMQSubscriber.h b/utils/pcTests/ZeroMQTest/ZeroMQSubscriber.h index c3b8401f03f..03a2ff7d1ad 100644 --- a/utils/pcTests/ZeroMQTest/ZeroMQSubscriber.h +++ b/utils/pcTests/ZeroMQTest/ZeroMQSubscriber.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -16,7 +16,7 @@ #include #include -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" using namespace std; class ZeroMQSubscriber { diff --git a/utils/pcTests/ZeroMQTest/main_ZeroMQTest.cpp b/utils/pcTests/ZeroMQTest/main_ZeroMQTest.cpp index b8fcdd1362b..0b77ec165ba 100644 --- a/utils/pcTests/ZeroMQTest/main_ZeroMQTest.cpp +++ b/utils/pcTests/ZeroMQTest/main_ZeroMQTest.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/pcTests/win32/DiscovertyTest/DiscoveryTest.vcxproj b/utils/pcTests/win32/DiscovertyTest/DiscoveryTest.vcxproj index 0b7b040045b..ca61a78e207 100644 --- a/utils/pcTests/win32/DiscovertyTest/DiscoveryTest.vcxproj +++ b/utils/pcTests/win32/DiscovertyTest/DiscoveryTest.vcxproj @@ -53,7 +53,7 @@ Level3 Disabled _MBCS;%(PreprocessorDefinitions);__LITTLE_ENDIAN__;_WIN32; - $(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) Console @@ -71,7 +71,7 @@ true true _MBCS;%(PreprocessorDefinitions);__LITTLE_ENDIAN__;_WIN32; - $(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) Console diff --git a/utils/pcTests/win32/DomainTest.vcxproj b/utils/pcTests/win32/DomainTest.vcxproj index 32455189bb4..2a01af88b94 100644 --- a/utils/pcTests/win32/DomainTest.vcxproj +++ b/utils/pcTests/win32/DomainTest.vcxproj @@ -58,7 +58,7 @@ Level3 Disabled - $(ProjectDir)..\..\..\include;$(ProjectDir)..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(ProjectDir)..\..\..\include;$(ProjectDir)..\..\..\include\fastrtps;$(LIB_BOOST_PATH) _MBCS;%(PreprocessorDefinitions);__LITTLE_ENDIAN__;_WIN32; @@ -70,7 +70,7 @@ Level3 Disabled - $(ProjectDir)..\..\..\include;$(ProjectDir)..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(ProjectDir)..\..\..\include;$(ProjectDir)..\..\..\include\fastrtps;$(LIB_BOOST_PATH) _MBCS;%(PreprocessorDefinitions);__LITTLE_ENDIAN__;_WIN32; diff --git a/utils/pcTests/win32/StatefulTest/StatefulTest.vcxproj b/utils/pcTests/win32/StatefulTest/StatefulTest.vcxproj index d0d499d94eb..510262708de 100644 --- a/utils/pcTests/win32/StatefulTest/StatefulTest.vcxproj +++ b/utils/pcTests/win32/StatefulTest/StatefulTest.vcxproj @@ -53,7 +53,7 @@ Level3 Disabled _MBCS;%(PreprocessorDefinitions);__LITTLE_ENDIAN__;_WIN32; - $(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) Console @@ -71,7 +71,7 @@ true true _MBCS;%(PreprocessorDefinitions);__LITTLE_ENDIAN__;_WIN32; - $(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) Console diff --git a/utils/pcTests/win32/StatelessTest1/StatelessTest1.vcxproj b/utils/pcTests/win32/StatelessTest1/StatelessTest1.vcxproj index c7392c17e41..251293131e9 100644 --- a/utils/pcTests/win32/StatelessTest1/StatelessTest1.vcxproj +++ b/utils/pcTests/win32/StatelessTest1/StatelessTest1.vcxproj @@ -50,7 +50,7 @@ Level3 Disabled _MBCS;%(PreprocessorDefinitions);__LITTLE_ENDIAN__;_WIN32; - $(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) Console @@ -68,7 +68,7 @@ true true _MBCS;%(PreprocessorDefinitions);__LITTLE_ENDIAN__;_WIN32; - $(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) Console diff --git a/utils/pcTests/win32/ZeroMQTest/ZeroMQTest.vcxproj b/utils/pcTests/win32/ZeroMQTest/ZeroMQTest.vcxproj index 2f0baae9127..09c3ec9e502 100644 --- a/utils/pcTests/win32/ZeroMQTest/ZeroMQTest.vcxproj +++ b/utils/pcTests/win32/ZeroMQTest/ZeroMQTest.vcxproj @@ -51,7 +51,7 @@ Level3 Disabled BOOST_ALL_DYN_LINK;_MBCS;_DEBUG;%(PreprocessorDefinitions);__LITTLE_ENDIAN__;ZMQ_STATIC;_WIN32 - C:\zeromq-4.0.4\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + C:\zeromq-4.0.4\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) true @@ -66,7 +66,7 @@ MaxSpeed true true - C:\zeromq-4.0.4\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + C:\zeromq-4.0.4\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) ZMQ_STATIC;_MBCS;__LITTLE_ENDIAN__;_WIN32;BOOST_ALL_DYN_LINK;%(PreprocessorDefinitions) diff --git a/utils/pcTests/win32/pcTests.sln.bat b/utils/pcTests/win32/pcTests.sln.bat index 0f18073ede2..7fb6e17cb20 100644 --- a/utils/pcTests/win32/pcTests.sln.bat +++ b/utils/pcTests/win32/pcTests.sln.bat @@ -1,9 +1,9 @@ :: This script execute Visual Studio getting first the version of the product. :: Get the current vesion of FastCDR -call %EPROSIMADIR%\scripts\common_pack_functions.bat :getVersionFromCPP VERSIONEPROSIMARTPS ..\..\..\include\eprosimartps\eprosimartps_version.h +call %EPROSIMADIR%\scripts\common_pack_functions.bat :getVersionFromCPP VERSIONfastrtps ..\..\..\include\fastrtps\fastrtps_version.h if not %errorstatus%==0 goto :EOF -set VERSION=-%VERSIONEPROSIMARTPS% +set VERSION=-%VERSIONfastrtps% start "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\devenv.exe" pcTests.sln diff --git a/utils/scripts/build_ertps.bat b/utils/scripts/build_ertps.bat index f3ecfabf776..f3d51337b27 100644 --- a/utils/scripts/build_ertps.bat +++ b/utils/scripts/build_ertps.bat @@ -6,7 +6,7 @@ set errorstatus=0 :: Get the current vesion of CDR -call thirdparty\dev-env\scripts\common_pack_functions.bat :getVersionFromCPP VERSIONRTPS ..\..\include\eprosimartps\eprosimartps_version.h +call thirdparty\dev-env\scripts\common_pack_functions.bat :getVersionFromCPP VERSIONRTPS ..\..\include\fastrtps\fastrtps_version.h if not %errorstatus%==0 goto :exit set WIN32VER=%1 diff --git a/utils/scripts/package_eprosimartps.bat b/utils/scripts/package_eprosimartps.bat index 9cb68f70b24..32e24482b2d 100644 --- a/utils/scripts/package_eprosimartps.bat +++ b/utils/scripts/package_eprosimartps.bat @@ -30,7 +30,7 @@ if not %errorstatus%==0 goto :exit cd "..\..\..\..\" :: Get the current vesion of RTPS -call %EPROSIMADIR%\scripts\common_pack_functions.bat :getVersionFromCPP VERSIONRTPS include/eprosimartps/eprosimartps_version.h +call %EPROSIMADIR%\scripts\common_pack_functions.bat :getVersionFromCPP VERSIONRTPS include/fastrtps/fastrtps_version.h if not %errorstatus%==0 goto :exit :: Compile RTPS for target. diff --git a/utils/scripts/package_eprosimartps.sh b/utils/scripts/package_eprosimartps.sh index ce31d9c91f6..573de7dae07 100755 --- a/utils/scripts/package_eprosimartps.sh +++ b/utils/scripts/package_eprosimartps.sh @@ -18,7 +18,7 @@ function package { # Get the current version of eRTPS - . thirdparty/dev-env/scripts/common_pack_functions.sh getVersionFromCPP ertpsversion include/eprosimartps/eprosimartps_version.h + . thirdparty/dev-env/scripts/common_pack_functions.sh getVersionFromCPP ertpsversion include/fastrtps/fastrtps_version.h errorstatus=$? if [ $errorstatus != 0 ]; then return; fi diff --git a/utils/unitTest/Makefile b/utils/unitTest/Makefile index 382b994327e..16a0c1d59d3 100644 --- a/utils/unitTest/Makefile +++ b/utils/unitTest/Makefile @@ -24,8 +24,8 @@ UNITTEST_TARGET= $(BASEDIR)/bin/$(EPROSIMA_TARGET)/unitTest UNITTEST_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/../include \ -I$(EPROSIMADIR)/code -UNITTEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../lib/$(EPROSIMA_TARGET) -leprosimartpsd -lboost_system -lboost_thread -lgtest -lpthread -UNITTEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../lib/$(EPROSIMA_TARGET) -leprosimartps -lboost_system -lboost_thread -lgtest -lpthread +UNITTEST_LIBS_DEBUG= $(LIBS_DEBUG) -L$(BASEDIR)/../lib/$(EPROSIMA_TARGET) -lfastrtpsd -lboost_system -lboost_thread -lgtest -lpthread +UNITTEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../lib/$(EPROSIMA_TARGET) -lfastrtps -lboost_system -lboost_thread -lgtest -lpthread UNITTEST_SRC_CFILES= diff --git a/utils/unitTest/ertps/common/test_common.cpp b/utils/unitTest/ertps/common/test_common.cpp index 28c374319a8..b2ed08002a5 100644 --- a/utils/unitTest/ertps/common/test_common.cpp +++ b/utils/unitTest/ertps/common/test_common.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,7 +15,7 @@ * grcanosa@gmail.com */ -#include "eprosimartps/common/CacheChange.h" +#include "fastrtps/common/CacheChange.h" TEST(CommonTypes, CDRMessage) { diff --git a/utils/unitTest/ertps/dds/test_DomainParticipant.cpp b/utils/unitTest/ertps/dds/test_DomainParticipant.cpp index 211ebb6f4ea..2f03636af50 100644 --- a/utils/unitTest/ertps/dds/test_DomainParticipant.cpp +++ b/utils/unitTest/ertps/dds/test_DomainParticipant.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -18,8 +18,8 @@ #include "gtest/gtest.h" -#include "eprosimartps/rtps_all.h" -#include "eprosimartps/dds/DomainRTPSParticipant.h" +#include "fastrtps/rtps_all.h" +#include "fastrtps/dds/DomainRTPSParticipant.h" using namespace eprosima; namespace eprosima{ diff --git a/utils/unitTest/ertps/test_CDRMessage.cpp b/utils/unitTest/ertps/test_CDRMessage.cpp index 64a2cd09a55..c2712931067 100644 --- a/utils/unitTest/ertps/test_CDRMessage.cpp +++ b/utils/unitTest/ertps/test_CDRMessage.cpp @@ -1,4 +1,4 @@ -#include "eprosimartps/CDRMessage.h" +#include "fastrtps/CDRMessage.h" diff --git a/utils/unitTest/ertps/test_CacheChangePool.cpp b/utils/unitTest/ertps/test_CacheChangePool.cpp index 6f000b8a940..09013b910c5 100644 --- a/utils/unitTest/ertps/test_CacheChangePool.cpp +++ b/utils/unitTest/ertps/test_CacheChangePool.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,7 +15,7 @@ * grcanosa@gmail.com */ #include "gtest/gtest.h" -#include "eprosimartps/CacheChangePool.h" +#include "fastrtps/CacheChangePool.h" using namespace eprosima::rtps; diff --git a/utils/unitTest/ertps/test_HistoryCache.cpp b/utils/unitTest/ertps/test_HistoryCache.cpp index 83ce4a5c481..5d81dd82c74 100644 --- a/utils/unitTest/ertps/test_HistoryCache.cpp +++ b/utils/unitTest/ertps/test_HistoryCache.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,7 +15,7 @@ * grcanosa@gmail.com */ #include "gtest/gtest.h" -#include "eprosimartps/HistoryCache.h" +#include "fastrtps/HistoryCache.h" using namespace eprosima::rtps; diff --git a/utils/unitTest/ertps/test_Participant.cpp b/utils/unitTest/ertps/test_Participant.cpp index 70006471170..ef0179b2e09 100644 --- a/utils/unitTest/ertps/test_Participant.cpp +++ b/utils/unitTest/ertps/test_Participant.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -16,9 +16,9 @@ */ #include "gtest/gtest.h" -#include "eprosimartps/rtps_all.h" -#include "eprosimartps/RTPSParticipant.h" -#include "eprosimartps/dds/DomainRTPSParticipant.h" +#include "fastrtps/rtps_all.h" +#include "fastrtps/RTPSParticipant.h" +#include "fastrtps/dds/DomainRTPSParticipant.h" using namespace eprosima; namespace eprosima{ diff --git a/utils/unitTest/unit_test.cpp b/utils/unitTest/unit_test.cpp index 6c9efd57c21..22ac40b79bd 100644 --- a/utils/unitTest/unit_test.cpp +++ b/utils/unitTest/unit_test.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2013 eProsima. All rights reserved. * * This copy of FastCdr is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -30,7 +30,7 @@ #define COPYSTR strcpy #endif -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" using namespace eprosima; using namespace dds; diff --git a/utils/useTests/HelloWorldTest/HelloWorldPublisher.cpp b/utils/useTests/HelloWorldTest/HelloWorldPublisher.cpp index 6553c39248f..bbedbd4b752 100644 --- a/utils/useTests/HelloWorldTest/HelloWorldPublisher.cpp +++ b/utils/useTests/HelloWorldTest/HelloWorldPublisher.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/useTests/HelloWorldTest/HelloWorldPublisher.h b/utils/useTests/HelloWorldTest/HelloWorldPublisher.h index 46b24137bef..467913a2749 100644 --- a/utils/useTests/HelloWorldTest/HelloWorldPublisher.h +++ b/utils/useTests/HelloWorldTest/HelloWorldPublisher.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef HELLOWORLDPUBLISHER_H_ #define HELLOWORLDPUBLISHER_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "HelloWorld.h" class HelloWorldPublisher { diff --git a/utils/useTests/HelloWorldTest/HelloWorldSubscriber.cpp b/utils/useTests/HelloWorldTest/HelloWorldSubscriber.cpp index 1e070b98838..d0f9d015678 100644 --- a/utils/useTests/HelloWorldTest/HelloWorldSubscriber.cpp +++ b/utils/useTests/HelloWorldTest/HelloWorldSubscriber.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/useTests/HelloWorldTest/HelloWorldSubscriber.h b/utils/useTests/HelloWorldTest/HelloWorldSubscriber.h index c50b4037242..956dccdd268 100644 --- a/utils/useTests/HelloWorldTest/HelloWorldSubscriber.h +++ b/utils/useTests/HelloWorldTest/HelloWorldSubscriber.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef HELLOWORLDSUBSCRIBER_H_ #define HELLOWORLDSUBSCRIBER_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "HelloWorld.h" class HelloWorldSubscriber { diff --git a/utils/useTests/HelloWorldTest/HelloWorldTest.vcxproj b/utils/useTests/HelloWorldTest/HelloWorldTest.vcxproj index a884dd12745..2f355297034 100644 --- a/utils/useTests/HelloWorldTest/HelloWorldTest.vcxproj +++ b/utils/useTests/HelloWorldTest/HelloWorldTest.vcxproj @@ -80,11 +80,11 @@ Level3 Disabled BOOST_ALL_DYN_LINK;_MBCS;_DEBUG;%(PreprocessorDefinitions);__LITTLE_ENDIAN__;_WIN32; - $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(EPROSIMARTPSHOME)\include\eprosimartps;$(EPROSIMARTPSHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(fastrtpsHOME)\include\fastrtps;$(fastrtpsHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) true - $(LIB_BOOST_PATH)\stage\lib\x86;$(LIB_BOOST_PATH)\lib\x86;$(EPROSIMARTPSHOME)\lib\i86Win32VS2010;$(ProjectDir)..\..\..\..\lib\i86Win32VS2010;$(FAST_BUFFERS)\lib\i86Win32VS2010;$(LIB_BOOST_PATH)\stage\lib\x86 + $(LIB_BOOST_PATH)\stage\lib\x86;$(LIB_BOOST_PATH)\lib\x86;$(fastrtpsHOME)\lib\i86Win32VS2010;$(ProjectDir)..\..\..\..\lib\i86Win32VS2010;$(FAST_BUFFERS)\lib\i86Win32VS2010;$(LIB_BOOST_PATH)\stage\lib\x86 Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Iphlpapi.lib;%(AdditionalDependencies) Console @@ -94,11 +94,11 @@ Level3 Disabled BOOST_ALL_DYN_LINK;_MBCS;_DEBUG;%(PreprocessorDefinitions);__LITTLE_ENDIAN__;_WIN32; - $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(EPROSIMARTPSHOME)\include\eprosimartps;$(EPROSIMARTPSHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(fastrtpsHOME)\include\fastrtps;$(fastrtpsHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) true - $(EPROSIMARTPSHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\lib\x64;$(LIB_BOOST_PATH)\stage\lib\x64;$(FAST_BUFFERS)\lib\x64Win64VS2010;$(ProjectDir)..\..\..\..\lib\x64Win64VS2010;$(EPROSIMARTPSHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\stage\lib\x64 + $(fastrtpsHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\lib\x64;$(LIB_BOOST_PATH)\stage\lib\x64;$(FAST_BUFFERS)\lib\x64Win64VS2010;$(ProjectDir)..\..\..\..\lib\x64Win64VS2010;$(fastrtpsHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\stage\lib\x64 Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Iphlpapi.lib;%(AdditionalDependencies) Console @@ -109,14 +109,14 @@ MaxSpeed true true - $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(EPROSIMARTPSHOME)\include\eprosimartps;$(EPROSIMARTPSHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(fastrtpsHOME)\include\fastrtps;$(fastrtpsHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) _MBCS;__LITTLE_ENDIAN__;_WIN32;BOOST_ALL_DYN_LINK;%(PreprocessorDefinitions) true true true - $(LIB_BOOST_PATH)\stage\lib\x86;$(LIB_BOOST_PATH)\lib\x86;$(EPROSIMARTPSHOME)\lib\i86Win32VS2010;$(ProjectDir)..\..\..\..\lib\i86Win32VS2010;$(FAST_BUFFERS)\lib\i86Win32VS2010;$(EPROSIMARTPSHOME)\lib\i86Win32VS2010;$(LIB_BOOST_PATH)\stage\lib\x86 + $(LIB_BOOST_PATH)\stage\lib\x86;$(LIB_BOOST_PATH)\lib\x86;$(fastrtpsHOME)\lib\i86Win32VS2010;$(ProjectDir)..\..\..\..\lib\i86Win32VS2010;$(FAST_BUFFERS)\lib\i86Win32VS2010;$(fastrtpsHOME)\lib\i86Win32VS2010;$(LIB_BOOST_PATH)\stage\lib\x86 Console Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Iphlpapi.lib;%(AdditionalDependencies) @@ -127,14 +127,14 @@ MaxSpeed true true - $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(EPROSIMARTPSHOME)\include\eprosimartps;$(EPROSIMARTPSHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(fastrtpsHOME)\include\fastrtps;$(fastrtpsHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) _MBCS;__LITTLE_ENDIAN__;_WIN32;BOOST_ALL_DYN_LINK;%(PreprocessorDefinitions) true true true - $(EPROSIMARTPSHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\lib\x64;$(LIB_BOOST_PATH)\stage\lib\x64;$(FAST_BUFFERS)\lib\x64Win64VS2010;$(ProjectDir)..\..\..\..\lib\x64Win64VS2010;$(EPROSIMARTPSHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\stage\lib\x64 + $(fastrtpsHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\lib\x64;$(LIB_BOOST_PATH)\stage\lib\x64;$(FAST_BUFFERS)\lib\x64Win64VS2010;$(ProjectDir)..\..\..\..\lib\x64Win64VS2010;$(fastrtpsHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\stage\lib\x64 Console Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Iphlpapi.lib;%(AdditionalDependencies) diff --git a/utils/useTests/HelloWorldTest/HelloWorldType.cpp b/utils/useTests/HelloWorldTest/HelloWorldType.cpp index ec4b126d28b..8e9dbdf9e1e 100644 --- a/utils/useTests/HelloWorldTest/HelloWorldType.cpp +++ b/utils/useTests/HelloWorldTest/HelloWorldType.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/useTests/HelloWorldTest/HelloWorldType.h b/utils/useTests/HelloWorldTest/HelloWorldType.h index 3cf8d7b9c9d..c341ca582ae 100644 --- a/utils/useTests/HelloWorldTest/HelloWorldType.h +++ b/utils/useTests/HelloWorldTest/HelloWorldType.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef HELLOWORLDTYPE_H_ #define HELLOWORLDTYPE_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" class HelloWorldType:public TopicDataType { diff --git a/utils/useTests/HelloWorldTest/HelloWorld_main.cpp b/utils/useTests/HelloWorldTest/HelloWorld_main.cpp index 2359ae41574..64da6f29275 100644 --- a/utils/useTests/HelloWorldTest/HelloWorld_main.cpp +++ b/utils/useTests/HelloWorldTest/HelloWorld_main.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -11,7 +11,7 @@ * */ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "HelloWorldPublisher.h" #include "HelloWorldSubscriber.h" #include "HelloWorldType.h" diff --git a/utils/useTests/LatencyTest/LatencyTest.vcxproj b/utils/useTests/LatencyTest/LatencyTest.vcxproj index 47e61c119f2..abd302e4fe0 100644 --- a/utils/useTests/LatencyTest/LatencyTest.vcxproj +++ b/utils/useTests/LatencyTest/LatencyTest.vcxproj @@ -78,7 +78,7 @@ Level3 Disabled BOOST_ALL_DYN_LINK;_MBCS;_DEBUG;%(PreprocessorDefinitions);__LITTLE_ENDIAN__;_WIN32; - $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(EPROSIMARTPSHOME)\include\eprosimartps;$(EPROSIMARTPSHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(fastrtpsHOME)\include\fastrtps;$(fastrtpsHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) @@ -86,7 +86,7 @@ true - $(LIB_BOOST_PATH)\stage\lib\x86;$(LIB_BOOST_PATH)\lib\x86;$(EPROSIMARTPSHOME)\lib\i86Win32VS2010;$(ProjectDir)..\..\..\..\lib\i86Win32VS2010;$(LIB_BOOST_PATH)\stage\lib\x86 + $(LIB_BOOST_PATH)\stage\lib\x86;$(LIB_BOOST_PATH)\lib\x86;$(fastrtpsHOME)\lib\i86Win32VS2010;$(ProjectDir)..\..\..\..\lib\i86Win32VS2010;$(LIB_BOOST_PATH)\stage\lib\x86 Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Iphlpapi.lib;%(AdditionalDependencies) Console @@ -102,7 +102,7 @@ Level3 Disabled BOOST_ALL_DYN_LINK;_MBCS;_DEBUG;%(PreprocessorDefinitions);__LITTLE_ENDIAN__;_WIN32; - $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(EPROSIMARTPSHOME)\include\eprosimartps;$(EPROSIMARTPSHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(fastrtpsHOME)\include\fastrtps;$(fastrtpsHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) @@ -110,7 +110,7 @@ true - $(EPROSIMARTPSHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\lib\x64;$(LIB_BOOST_PATH)\stage\lib\x64;$(ProjectDir)..\..\..\..\lib\x64Win64VS2010;$(EPROSIMARTPSHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\stage\lib\x64 + $(fastrtpsHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\lib\x64;$(LIB_BOOST_PATH)\stage\lib\x64;$(ProjectDir)..\..\..\..\lib\x64Win64VS2010;$(fastrtpsHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\stage\lib\x64 Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Iphlpapi.lib;%(AdditionalDependencies) Console @@ -128,13 +128,13 @@ true true _MBCS;__LITTLE_ENDIAN__;_WIN32;BOOST_ALL_DYN_LINK;%(PreprocessorDefinitions) - $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(EPROSIMARTPSHOME)\include\eprosimartps;$(EPROSIMARTPSHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(fastrtpsHOME)\include\fastrtps;$(fastrtpsHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) true true true - $(LIB_BOOST_PATH)\stage\lib\x86;$(LIB_BOOST_PATH)\lib\x86;$(EPROSIMARTPSHOME)\lib\i86Win32VS2010;$(ProjectDir)..\..\..\..\lib\i86Win32VS2010;$(EPROSIMARTPSHOME)\lib\i86Win32VS2010;$(LIB_BOOST_PATH)\stage\lib\x86 + $(LIB_BOOST_PATH)\stage\lib\x86;$(LIB_BOOST_PATH)\lib\x86;$(fastrtpsHOME)\lib\i86Win32VS2010;$(ProjectDir)..\..\..\..\lib\i86Win32VS2010;$(fastrtpsHOME)\lib\i86Win32VS2010;$(LIB_BOOST_PATH)\stage\lib\x86 Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Iphlpapi.lib;%(AdditionalDependencies) Console @@ -146,13 +146,13 @@ true true _MBCS;__LITTLE_ENDIAN__;_WIN32;BOOST_ALL_DYN_LINK;%(PreprocessorDefinitions) - $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(EPROSIMARTPSHOME)\include\eprosimartps;$(EPROSIMARTPSHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(fastrtpsHOME)\include\fastrtps;$(fastrtpsHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) true true true - $(EPROSIMARTPSHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\lib\x64;$(LIB_BOOST_PATH)\stage\lib\x64;$(ProjectDir)..\..\..\..\lib\x64Win64VS2010;$(EPROSIMARTPSHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\stage\lib\x64 + $(fastrtpsHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\lib\x64;$(LIB_BOOST_PATH)\stage\lib\x64;$(ProjectDir)..\..\..\..\lib\x64Win64VS2010;$(fastrtpsHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\stage\lib\x64 Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Iphlpapi.lib;%(AdditionalDependencies) Console diff --git a/utils/useTests/LatencyTest/LatencyTestPublisher.cpp b/utils/useTests/LatencyTest/LatencyTestPublisher.cpp index e5ed9bcaeba..314b099e28e 100644 --- a/utils/useTests/LatencyTest/LatencyTestPublisher.cpp +++ b/utils/useTests/LatencyTest/LatencyTestPublisher.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/useTests/LatencyTest/LatencyTestPublisher.h b/utils/useTests/LatencyTest/LatencyTestPublisher.h index 2421aaa590c..43367b946a8 100644 --- a/utils/useTests/LatencyTest/LatencyTestPublisher.h +++ b/utils/useTests/LatencyTest/LatencyTestPublisher.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/useTests/LatencyTest/LatencyTestSubscriber.cpp b/utils/useTests/LatencyTest/LatencyTestSubscriber.cpp index 9d71556533f..181a2e13097 100644 --- a/utils/useTests/LatencyTest/LatencyTestSubscriber.cpp +++ b/utils/useTests/LatencyTest/LatencyTestSubscriber.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/useTests/LatencyTest/LatencyTestSubscriber.h b/utils/useTests/LatencyTest/LatencyTestSubscriber.h index 3faaaf27e26..bb154efeb49 100644 --- a/utils/useTests/LatencyTest/LatencyTestSubscriber.h +++ b/utils/useTests/LatencyTest/LatencyTestSubscriber.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/useTests/LatencyTest/LatencyTestTypes.cpp b/utils/useTests/LatencyTest/LatencyTestTypes.cpp index 789d9111476..899ef107442 100644 --- a/utils/useTests/LatencyTest/LatencyTestTypes.cpp +++ b/utils/useTests/LatencyTest/LatencyTestTypes.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ diff --git a/utils/useTests/LatencyTest/LatencyTestTypes.h b/utils/useTests/LatencyTest/LatencyTestTypes.h index 2d785184284..ec9ed240f0f 100644 --- a/utils/useTests/LatencyTest/LatencyTestTypes.h +++ b/utils/useTests/LatencyTest/LatencyTestTypes.h @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -14,7 +14,7 @@ #ifndef LATENCYTESTTYPES_H_ #define LATENCYTESTTYPES_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" diff --git a/utils/useTests/LatencyTest/Makefile b/utils/useTests/LatencyTest/Makefile index 42aebdbe8ca..cfb7324d078 100644 --- a/utils/useTests/LatencyTest/Makefile +++ b/utils/useTests/LatencyTest/Makefile @@ -39,7 +39,7 @@ STATETEST_TARGET= $(BASEDIR)/bin/$(EPROSIMA_TARGET)/LatencyTest STATETEST_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/../../../include \ -I$(EPROSIMADIR)/code -STATETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartps -lboost_system -lboost_thread +STATETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtps -lboost_system -lboost_thread STATETEST_SRC_CFILES= diff --git a/utils/useTests/LatencyTest/main_LatencyTest.cpp b/utils/useTests/LatencyTest/main_LatencyTest.cpp index ec823693c65..805c8232ec3 100644 --- a/utils/useTests/LatencyTest/main_LatencyTest.cpp +++ b/utils/useTests/LatencyTest/main_LatencyTest.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2013 eProsima. All rights reserved. * * This copy of FastCdr is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -18,7 +18,7 @@ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "LatencyTestPublisher.h" #include "LatencyTestSubscriber.h" diff --git a/utils/useTests/ReliableTest/Makefile b/utils/useTests/ReliableTest/Makefile index bc4d6d48ff0..a82d6c791a6 100644 --- a/utils/useTests/ReliableTest/Makefile +++ b/utils/useTests/ReliableTest/Makefile @@ -39,7 +39,7 @@ RELIABLETEST_INCLUDE_DIRS= $(INCLUDE_DIRS) -I$(BASEDIR)/../../../include \ -I$(EPROSIMADIR)/code -RELIABLETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -leprosimartps -lboost_system -lboost_thread +RELIABLETEST_LIBS_RELEASE= $(LIBS) -L$(BASEDIR)/../../../lib/$(EPROSIMA_TARGET) -lfastrtps -lboost_system -lboost_thread RELIABLETEST_SRC_CFILES= diff --git a/utils/useTests/ReliableTest/ReliableCommunicationTest.cpp b/utils/useTests/ReliableTest/ReliableCommunicationTest.cpp index 8931808eec6..92be7676994 100644 --- a/utils/useTests/ReliableTest/ReliableCommunicationTest.cpp +++ b/utils/useTests/ReliableTest/ReliableCommunicationTest.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2014 eProsima. All rights reserved. * * This copy of eProsima RTPS is licensed to you under the terms described in the - * EPROSIMARTPS_LIBRARY_LICENSE file included in this distribution. + * fastrtps_LIBRARY_LICENSE file included in this distribution. * *************************************************************************/ @@ -15,13 +15,13 @@ #include #include -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" -//#include "eprosimartps/dds/DomainRTPSParticipant.h" -//#include "eprosimartps/RTPSParticipant.h" +//#include "fastrtps/dds/DomainRTPSParticipant.h" +//#include "fastrtps/RTPSParticipant.h" // -//#include "eprosimartps/qos/ParameterList.h" -//#include "eprosimartps/utils/RTPSLog.h" +//#include "fastrtps/qos/ParameterList.h" +//#include "fastrtps/utils/RTPSLog.h" diff --git a/utils/useTests/ReliableTest/ReliableTest.vcxproj b/utils/useTests/ReliableTest/ReliableTest.vcxproj index 2a2cb45c673..08fa31fcc76 100644 --- a/utils/useTests/ReliableTest/ReliableTest.vcxproj +++ b/utils/useTests/ReliableTest/ReliableTest.vcxproj @@ -70,11 +70,11 @@ Level3 Disabled BOOST_ALL_DYN_LINK;_MBCS;_DEBUG;%(PreprocessorDefinitions);__LITTLE_ENDIAN__;_WIN32; - $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(EPROSIMARTPSHOME)\include\eprosimartps;$(EPROSIMARTPSHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(fastrtpsHOME)\include\fastrtps;$(fastrtpsHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) true - $(LIB_BOOST_PATH)\stage\lib\x86;$(LIB_BOOST_PATH)\lib\x86;$(EPROSIMARTPSHOME)\lib\i86Win32VS2010;$(ProjectDir)..\..\..\..\lib\i86Win32VS2010;$(LIB_BOOST_PATH)\stage\lib\x86 + $(LIB_BOOST_PATH)\stage\lib\x86;$(LIB_BOOST_PATH)\lib\x86;$(fastrtpsHOME)\lib\i86Win32VS2010;$(ProjectDir)..\..\..\..\lib\i86Win32VS2010;$(LIB_BOOST_PATH)\stage\lib\x86 Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Iphlpapi.lib;%(AdditionalDependencies) Console @@ -84,11 +84,11 @@ Level3 Disabled BOOST_ALL_DYN_LINK;_MBCS;_DEBUG;%(PreprocessorDefinitions);__LITTLE_ENDIAN__;_WIN32; - $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(EPROSIMARTPSHOME)\include\eprosimartps;$(EPROSIMARTPSHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(fastrtpsHOME)\include\fastrtps;$(fastrtpsHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) true - $(EPROSIMARTPSHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\lib\x64;$(LIB_BOOST_PATH)\stage\lib\x64;$(ProjectDir)..\..\..\..\lib\x64Win64VS2010;$(EPROSIMARTPSHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\stage\lib\x64 + $(fastrtpsHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\lib\x64;$(LIB_BOOST_PATH)\stage\lib\x64;$(ProjectDir)..\..\..\..\lib\x64Win64VS2010;$(fastrtpsHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\stage\lib\x64 Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Iphlpapi.lib;%(AdditionalDependencies) Console @@ -99,14 +99,14 @@ MaxSpeed true true - $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(EPROSIMARTPSHOME)\include\eprosimartps;$(EPROSIMARTPSHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(fastrtpsHOME)\include\fastrtps;$(fastrtpsHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) _MBCS;__LITTLE_ENDIAN__;_WIN32;BOOST_ALL_DYN_LINK;%(PreprocessorDefinitions) true true true - $(LIB_BOOST_PATH)\stage\lib\x86;$(LIB_BOOST_PATH)\lib\x86;$(EPROSIMARTPSHOME)\lib\i86Win32VS2010;$(ProjectDir)..\..\..\..\lib\i86Win32VS2010;$(EPROSIMARTPSHOME)\lib\i86Win32VS2010;$(LIB_BOOST_PATH)\stage\lib\x86 + $(LIB_BOOST_PATH)\stage\lib\x86;$(LIB_BOOST_PATH)\lib\x86;$(fastrtpsHOME)\lib\i86Win32VS2010;$(ProjectDir)..\..\..\..\lib\i86Win32VS2010;$(fastrtpsHOME)\lib\i86Win32VS2010;$(LIB_BOOST_PATH)\stage\lib\x86 Console Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Iphlpapi.lib;%(AdditionalDependencies) @@ -117,14 +117,14 @@ MaxSpeed true true - $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(EPROSIMARTPSHOME)\include\eprosimartps;$(EPROSIMARTPSHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\eprosimartps;$(LIB_BOOST_PATH) + $(FAST_BUFFERS)\include;$(FAST_BUFFERS)\include;$(fastrtpsHOME)\include\fastrtps;$(fastrtpsHOME)\include;$(ProjectDir)..\..\..\..\include\;$(ProjectDir)..\..\..\..\include\fastrtps;$(LIB_BOOST_PATH) _MBCS;__LITTLE_ENDIAN__;_WIN32;BOOST_ALL_DYN_LINK;%(PreprocessorDefinitions) true true true - $(EPROSIMARTPSHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\lib\x64;$(LIB_BOOST_PATH)\stage\lib\x64;$(ProjectDir)..\..\..\..\lib\x64Win64VS2010;$(EPROSIMARTPSHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\stage\lib\x64 + $(fastrtpsHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\lib\x64;$(LIB_BOOST_PATH)\stage\lib\x64;$(ProjectDir)..\..\..\..\lib\x64Win64VS2010;$(fastrtpsHOME)\lib\x64Win64VS2010;$(LIB_BOOST_PATH)\stage\lib\x64 Console Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Iphlpapi.lib;%(AdditionalDependencies) diff --git a/utils/useTests/SimplePublisherSubscriber/SimplePubSubMain.cxx b/utils/useTests/SimplePublisherSubscriber/SimplePubSubMain.cxx index d7b2c6202b8..93c95a86e3e 100644 --- a/utils/useTests/SimplePublisherSubscriber/SimplePubSubMain.cxx +++ b/utils/useTests/SimplePublisherSubscriber/SimplePubSubMain.cxx @@ -2,18 +2,18 @@ * Copyright (c) 2013 eProsima. All rights reserved. * * This generated file is licensed to you under the terms described in the - * eprosimartps_LICENSE file included in this eprosimartps distribution. + * fastrtps_LICENSE file included in this fastrtps distribution. * ************************************************************************* * * @file SimplePubSubMain.cpp * This file acts as a main entry point to the application. * - * This file was generated by the tool eprosimartpsgen. + * This file was generated by the tool fastrtpsgen. */ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "SimplePublisher.h" #include "SimpleSubscriber.h" #include "SimplePubSubType.h" diff --git a/utils/useTests/SimplePublisherSubscriber/SimplePubSubType.cxx b/utils/useTests/SimplePublisherSubscriber/SimplePubSubType.cxx index 29294960aca..6d39779e066 100644 --- a/utils/useTests/SimplePublisherSubscriber/SimplePubSubType.cxx +++ b/utils/useTests/SimplePublisherSubscriber/SimplePubSubType.cxx @@ -2,14 +2,14 @@ * Copyright (c) 2013 eProsima. All rights reserved. * * This generated file is licensed to you under the terms described in the - * eprosimartps_LICENSE file included in this eprosimartps distribution. + * fastrtps_LICENSE file included in this fastrtps distribution. * ************************************************************************* * * @file SimpleRTPSPubSubType.cpp * This header file contains the implementation of the serialization functions. * - * This file was generated by the tool eprosimartpsgen. + * This file was generated by the tool fastrtpsgen. */ diff --git a/utils/useTests/SimplePublisherSubscriber/SimplePubSubType.h b/utils/useTests/SimplePublisherSubscriber/SimplePubSubType.h index 45fe2f7231b..9a43e1e39d7 100644 --- a/utils/useTests/SimplePublisherSubscriber/SimplePubSubType.h +++ b/utils/useTests/SimplePublisherSubscriber/SimplePubSubType.h @@ -2,21 +2,21 @@ * Copyright (c) 2013 eProsima. All rights reserved. * * This generated file is licensed to you under the terms described in the - * eprosimartps_LICENSE file included in this eprosimartps distribution. + * fastrtps_LICENSE file included in this fastrtps distribution. * ************************************************************************* * * @file SimpleRTPSPubSubType.h * This header file contains the declaration of the serialization functions. * - * This file was generated by the tool eprosimartpsgen. + * This file was generated by the tool fastrtpsgen. */ #ifndef _Simple_PUBSUBTYPE_H_ #define _Simple_PUBSUBTYPE_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" #include "Simple.h" diff --git a/utils/useTests/SimplePublisherSubscriber/SimplePublisher.cxx b/utils/useTests/SimplePublisherSubscriber/SimplePublisher.cxx index 5881c84409b..7691c8db8e7 100644 --- a/utils/useTests/SimplePublisherSubscriber/SimplePublisher.cxx +++ b/utils/useTests/SimplePublisherSubscriber/SimplePublisher.cxx @@ -2,14 +2,14 @@ * Copyright (c) 2013 eProsima. All rights reserved. * * This generated file is licensed to you under the terms described in the - * eprosimartps_LICENSE file included in this eprosimartps distribution. + * fastrtps_LICENSE file included in this fastrtps distribution. * ************************************************************************* * * @file SimplePublisher.cpp * This file contains the implementation of the publisher functions. * - * This file was generated by the tool eprosimartpsgen. + * This file was generated by the tool fastrtpsgen. */ diff --git a/utils/useTests/SimplePublisherSubscriber/SimplePublisher.h b/utils/useTests/SimplePublisherSubscriber/SimplePublisher.h index 70ef888564e..d32c8958102 100644 --- a/utils/useTests/SimplePublisherSubscriber/SimplePublisher.h +++ b/utils/useTests/SimplePublisherSubscriber/SimplePublisher.h @@ -2,21 +2,21 @@ * Copyright (c) 2013 eProsima. All rights reserved. * * This generated file is licensed to you under the terms described in the - * eprosimartps_LICENSE file included in this eprosimartps distribution. + * fastrtps_LICENSE file included in this fastrtps distribution. * ************************************************************************* * * @file SimplePublisher.h * This header file contains the declaration of the publisher functions. * - * This file was generated by the tool eprosimartpsgen. + * This file was generated by the tool fastrtpsgen. */ #ifndef _Simple_PUBLISHER_H_ #define _Simple_PUBLISHER_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" class SimplePublisher { diff --git a/utils/useTests/SimplePublisherSubscriber/SimplePublisherSubscriber-i86Win32VS2010.vcxproj b/utils/useTests/SimplePublisherSubscriber/SimplePublisherSubscriber-i86Win32VS2010.vcxproj index 0f3e671abf8..9ac78ea2a72 100644 --- a/utils/useTests/SimplePublisherSubscriber/SimplePublisherSubscriber-i86Win32VS2010.vcxproj +++ b/utils/useTests/SimplePublisherSubscriber/SimplePublisherSubscriber-i86Win32VS2010.vcxproj @@ -88,7 +88,7 @@ Level3 Disabled - $(EPROSIMARTPSHOME)\include;$(LIB_BOOST_PATH);%(AdditionalIncludeDirectories) + $(fastrtpsHOME)\include;$(LIB_BOOST_PATH);%(AdditionalIncludeDirectories) _WIN32_WINDOWS;WIN32;EPROSIMA_WIN32;EPROSIMA_ALL_DYN_LINK;BOOST_ALL_DYN_LINK;_DEBUG; NotUsing @@ -98,14 +98,14 @@ false SimpleTypesd.lib;;%(AdditionalDependencies) $(TargetDir)$(TargetName)$(TargetExt) - $(EPROSIMARTPSHOME)/lib/i86Win32VS2010;.\lib\i86Win32VS2010;%(AdditionalLibraryDirectories) + $(fastrtpsHOME)/lib/i86Win32VS2010;.\lib\i86Win32VS2010;%(AdditionalLibraryDirectories) Level3 MaxSpeed - $(EPROSIMARTPSHOME)\include;$(LIB_BOOST_PATH);%(AdditionalIncludeDirectories) + $(fastrtpsHOME)\include;$(LIB_BOOST_PATH);%(AdditionalIncludeDirectories) _WIN32_WINDOWS;WIN32;EPROSIMA_WIN32;EPROSIMA_ALL_DYN_LINK;BOOST_ALL_DYN_LINK;NDEBUG; NotUsing @@ -115,14 +115,14 @@ false SimpleTypes.lib;;%(AdditionalDependencies) $(TargetDir)$(TargetName)$(TargetExt) - $(EPROSIMARTPSHOME)/lib/i86Win32VS2010;.\lib\i86Win32VS2010;%(AdditionalLibraryDirectories) + $(fastrtpsHOME)/lib/i86Win32VS2010;.\lib\i86Win32VS2010;%(AdditionalLibraryDirectories) Level3 Disabled - $(EPROSIMARTPSHOME)\include;$(LIB_BOOST_PATH);%(AdditionalIncludeDirectories) + $(fastrtpsHOME)\include;$(LIB_BOOST_PATH);%(AdditionalIncludeDirectories) _WIN32_WINDOWS;WIN32;EPROSIMA_WIN32;BOOST_ALL_DYN_LINK;_DEBUG; NotUsing @@ -132,14 +132,14 @@ false libSimpleTypesd.lib;Shlwapi.lib;Iphlpapi.lib;;%(AdditionalDependencies) $(TargetDir)$(TargetName)$(TargetExt) - $(EPROSIMARTPSHOME)/lib/i86Win32VS2010;.\lib\i86Win32VS2010;%(AdditionalLibraryDirectories) + $(fastrtpsHOME)/lib/i86Win32VS2010;.\lib\i86Win32VS2010;%(AdditionalLibraryDirectories) Level3 MaxSpeed - $(EPROSIMARTPSHOME)\include;$(LIB_BOOST_PATH);%(AdditionalIncludeDirectories) + $(fastrtpsHOME)\include;$(LIB_BOOST_PATH);%(AdditionalIncludeDirectories) _WIN32_WINDOWS;WIN32;EPROSIMA_WIN32;BOOST_ALL_DYN_LINK;NDEBUG; NotUsing @@ -149,7 +149,7 @@ false libSimpleTypes.lib;Shlwapi.lib;Iphlpapi.lib;;%(AdditionalDependencies) $(TargetDir)$(TargetName)$(TargetExt) - $(EPROSIMARTPSHOME)/lib/i86Win32VS2010;.\lib\i86Win32VS2010;%(AdditionalLibraryDirectories) + $(fastrtpsHOME)/lib/i86Win32VS2010;.\lib\i86Win32VS2010;%(AdditionalLibraryDirectories) diff --git a/utils/useTests/SimplePublisherSubscriber/SimpleSubscriber.cxx b/utils/useTests/SimplePublisherSubscriber/SimpleSubscriber.cxx index 50a0ea348f8..edf05b37b78 100644 --- a/utils/useTests/SimplePublisherSubscriber/SimpleSubscriber.cxx +++ b/utils/useTests/SimplePublisherSubscriber/SimpleSubscriber.cxx @@ -2,14 +2,14 @@ * Copyright (c) 2013 eProsima. All rights reserved. * * This generated file is licensed to you under the terms described in the - * eprosimartps_LICENSE file included in this eprosimartps distribution. + * fastrtps_LICENSE file included in this fastrtps distribution. * ************************************************************************* * * @file SimpleSubscriber.cpp * This file contains the implementation of the subscriber functions. * - * This file was generated by the tool eprosimartpsgen. + * This file was generated by the tool fastrtpsgen. */ diff --git a/utils/useTests/SimplePublisherSubscriber/SimpleSubscriber.h b/utils/useTests/SimplePublisherSubscriber/SimpleSubscriber.h index 2d0d908ef41..1aff4be59d5 100644 --- a/utils/useTests/SimplePublisherSubscriber/SimpleSubscriber.h +++ b/utils/useTests/SimplePublisherSubscriber/SimpleSubscriber.h @@ -2,21 +2,21 @@ * Copyright (c) 2013 eProsima. All rights reserved. * * This generated file is licensed to you under the terms described in the - * eprosimartps_LICENSE file included in this eprosimartps distribution. + * fastrtps_LICENSE file included in this fastrtps distribution. * ************************************************************************* * * @file SimpleSubscriber.h * This header file contains the declaration of the subscriber functions. * - * This file was generated by the tool eprosimartpsgen. + * This file was generated by the tool fastrtpsgen. */ #ifndef _Simple_SUBSCRIBER_H_ #define _Simple_SUBSCRIBER_H_ -#include "eprosimartps/rtps_all.h" +#include "fastrtps/rtps_all.h" class SimpleSubscriber { diff --git a/utils/useTests/SimplePublisherSubscriber/SimpleTypes-i86Win32VS2010.vcxproj b/utils/useTests/SimplePublisherSubscriber/SimpleTypes-i86Win32VS2010.vcxproj index 70beb8abecc..daaff1cf2e4 100644 --- a/utils/useTests/SimplePublisherSubscriber/SimpleTypes-i86Win32VS2010.vcxproj +++ b/utils/useTests/SimplePublisherSubscriber/SimpleTypes-i86Win32VS2010.vcxproj @@ -88,7 +88,7 @@ Level3 Disabled - $(EPROSIMARTPSHOME)\include;%(AdditionalIncludeDirectories) + $(fastrtpsHOME)\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_DEBUG;;EPROSIMA_USER_DLL_EXPORT;%(PreprocessorDefinitions) NotUsing @@ -98,14 +98,14 @@ true Shlwapi.lib;Iphlpapi.lib;;%(AdditionalDependencies) $(TargetDir)$(TargetName)$(TargetExt) - $(EPROSIMARTPSHOME)/lib/i86Win32VS2010;.\lib\i86Win32VS2010;%(AdditionalLibraryDirectories) + $(fastrtpsHOME)/lib/i86Win32VS2010;.\lib\i86Win32VS2010;%(AdditionalLibraryDirectories) Level3 MaxSpeed - $(EPROSIMARTPSHOME)\include;%(AdditionalIncludeDirectories) + $(fastrtpsHOME)\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;NDEBUG;;EPROSIMA_USER_DLL_EXPORT;%(PreprocessorDefinitions) NotUsing @@ -115,14 +115,14 @@ true Shlwapi.lib;Iphlpapi.lib;;%(AdditionalDependencies) $(TargetDir)$(TargetName)$(TargetExt) - $(EPROSIMARTPSHOME)/lib/i86Win32VS2010;.\lib\i86Win32VS2010;%(AdditionalLibraryDirectories) + $(fastrtpsHOME)/lib/i86Win32VS2010;.\lib\i86Win32VS2010;%(AdditionalLibraryDirectories) Level3 Disabled - $(EPROSIMARTPSHOME)\include;%(AdditionalIncludeDirectories) + $(fastrtpsHOME)\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;;%(PreprocessorDefinitions) NotUsing @@ -132,14 +132,14 @@ true Shlwapi.lib;Iphlpapi.lib;;WS2_32.lib;%(AdditionalDependencies) $(TargetDir)$(TargetName)$(TargetExt) - $(EPROSIMARTPSHOME)/lib/i86Win32VS2010;.\lib\i86Win32VS2010;%(AdditionalLibraryDirectories) + $(fastrtpsHOME)/lib/i86Win32VS2010;.\lib\i86Win32VS2010;%(AdditionalLibraryDirectories) Level3 MaxSpeed - $(EPROSIMARTPSHOME)\include;%(AdditionalIncludeDirectories) + $(fastrtpsHOME)\include;%(AdditionalIncludeDirectories) WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;;%(PreprocessorDefinitions) NotUsing @@ -149,7 +149,7 @@ true Shlwapi.lib;Iphlpapi.lib;;WS2_32.lib;%(AdditionalDependencies) $(TargetDir)$(TargetName)$(TargetExt) - $(EPROSIMARTPSHOME)/lib/i86Win32VS2010;.\lib\i86Win32VS2010;%(AdditionalLibraryDirectories) + $(fastrtpsHOME)/lib/i86Win32VS2010;.\lib\i86Win32VS2010;%(AdditionalLibraryDirectories) diff --git a/win32VS2010/cpp/eRTPS/copyHeaders.bat b/win32VS2010/cpp/eRTPS/copyHeaders.bat index 942296bd0f5..53c6e17ea95 100644 --- a/win32VS2010/cpp/eRTPS/copyHeaders.bat +++ b/win32VS2010/cpp/eRTPS/copyHeaders.bat @@ -1 +1 @@ -xcopy ..\..\..\include\eprosimartps\* "C:\Program Files\eProsima\eRTPS\include\eprosimartps\" /y /s \ No newline at end of file +xcopy ..\..\..\include\fastrtps\* "C:\Program Files\eProsima\eRTPS\include\fastrtps\" /y /s \ No newline at end of file diff --git a/win32VS2010/cpp/eRTPS/eRTPS.sln.bat b/win32VS2010/cpp/eRTPS/eRTPS.sln.bat index e959fb78315..625bc01236b 100644 --- a/win32VS2010/cpp/eRTPS/eRTPS.sln.bat +++ b/win32VS2010/cpp/eRTPS/eRTPS.sln.bat @@ -1,10 +1,10 @@ :: This script execute Visual Studio getting first the version of the product. :: Get the current vesion of FastCDR -call %EPROSIMADIR%\scripts\common_pack_functions.bat :getVersionFromCPP VERSIONEPROSIMARTPS ..\..\..\include\eprosimartps\eprosimartps_version.h +call %EPROSIMADIR%\scripts\common_pack_functions.bat :getVersionFromCPP VERSIONfastrtps ..\..\..\include\fastrtps\fastrtps_version.h if not %errorstatus%==0 goto :EOF -set VERSION=-%VERSIONEPROSIMARTPS% +set VERSION=-%VERSIONfastrtps% set LIB_BOOST_PATH=C:\local\boost_1_57_0 start "ERTPS" "C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\devenv.exe" eRTPS.sln diff --git a/win32VS2010/cpp/eRTPS/eRTPS/eRTPS.vcxproj b/win32VS2010/cpp/eRTPS/eRTPS/eRTPS.vcxproj index 850b8217202..de002ef5906 100644 --- a/win32VS2010/cpp/eRTPS/eRTPS/eRTPS.vcxproj +++ b/win32VS2010/cpp/eRTPS/eRTPS/eRTPS.vcxproj @@ -121,38 +121,38 @@ $(ProjectDir)..\..\..\..\lib\i86Win32VS2010\ $(Platform)\$(Configuration)\ - libeprosimartpsd$(VERSION) + libfastrtpsd$(VERSION) $(ProjectDir)..\..\..\..\lib\x64Win64VS2010\ $(Platform)\$(Configuration)\ - libeprosimartpsd$(VERSION) + libfastrtpsd$(VERSION) $(ProjectDir)..\..\..\..\lib\i86Win32VS2010\ $(Platform)\$(Configuration)\ - eprosimartpsd$(VERSION) + fastrtpsd$(VERSION) .dll false $(ProjectDir)..\..\..\..\lib\x64Win64VS2010\ $(Platform)\$(Configuration)\ - eprosimartpsd$(VERSION) + fastrtpsd$(VERSION) .dll false $(ProjectDir)..\..\..\..\lib\i86Win32VS2010\ $(Platform)\$(Configuration)\ - eprosimartps$(VERSION) + fastrtps$(VERSION) .dll false $(ProjectDir)..\..\..\..\lib\x64Win64VS2010\ $(Platform)\$(Configuration)\ - eprosimartps$(VERSION) + fastrtps$(VERSION) .dll false @@ -169,16 +169,16 @@ $(Platform)\$(Configuration)\ - libeprosimartps$(VERSION) + libfastrtps$(VERSION) - libeprosimartps$(VERSION) + libfastrtps$(VERSION) Level3 Disabled - $(ProjectDir)..\..\..\..\thirdparty\eprosima-common-code;$(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\eprosimartps + $(ProjectDir)..\..\..\..\thirdparty\eprosima-common-code;$(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\fastrtps BOOST_ALL_DYN_LINK;__DEBUG;__LITTLE_ENDIAN__;_WIN32;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; EditAndContinue MultiThreadedDebugDLL @@ -200,7 +200,7 @@ Level3 Disabled - $(ProjectDir)..\..\..\..\thirdparty\eprosima-common-code;$(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\eprosimartps + $(ProjectDir)..\..\..\..\thirdparty\eprosima-common-code;$(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\fastrtps BOOST_ALL_DYN_LINK;__DEBUG;__LITTLE_ENDIAN__;_WIN32;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; @@ -220,7 +220,7 @@ Level3 Disabled $(ProjectDir)..\..\..\..\thirdparty\eprosima-common-code;$(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(EPROSIMADIR)\code;%(AdditionalIncludeDirectories) - BOOST_ALL_DYN_LINK;__DEBUG;__LITTLE_ENDIAN__;_WIN32;EPROSIMARTPS_SOURCE;EPROSIMARTPS_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; + BOOST_ALL_DYN_LINK;__DEBUG;__LITTLE_ENDIAN__;_WIN32;fastrtps_SOURCE;fastrtps_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; true @@ -236,7 +236,7 @@ Level3 Disabled $(ProjectDir)..\..\..\..\thirdparty\eprosima-common-code;$(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(EPROSIMADIR)\code;%(AdditionalIncludeDirectories) - BOOST_ALL_DYN_LINK;__DEBUG;__LITTLE_ENDIAN__;_WIN32;EPROSIMARTPS_SOURCE;EPROSIMARTPS_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; + BOOST_ALL_DYN_LINK;__DEBUG;__LITTLE_ENDIAN__;_WIN32;fastrtps_SOURCE;fastrtps_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; true @@ -252,7 +252,7 @@ Level3 Disabled $(ProjectDir)..\..\..\..\thirdparty\eprosima-common-code;$(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(EPROSIMADIR)\code;%(AdditionalIncludeDirectories) - ;__LITTLE_ENDIAN__;_WIN32;EPROSIMARTPS_SOURCE;EPROSIMARTPS_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; + ;__LITTLE_ENDIAN__;_WIN32;fastrtps_SOURCE;fastrtps_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; MultiThreadedDLL Default @@ -269,7 +269,7 @@ Level3 Disabled $(ProjectDir)..\..\..\..\thirdparty\eprosima-common-code;$(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(EPROSIMADIR)\code;%(AdditionalIncludeDirectories) - __LITTLE_ENDIAN__;_WIN32;EPROSIMARTPS_SOURCE;EPROSIMARTPS_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; + __LITTLE_ENDIAN__;_WIN32;fastrtps_SOURCE;fastrtps_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; MultiThreadedDLL Default @@ -287,7 +287,7 @@ MaxSpeed true false - $(ProjectDir)..\..\..\..\thirdparty\eprosima-common-code;$(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\eprosimartps + $(ProjectDir)..\..\..\..\thirdparty\eprosima-common-code;$(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\fastrtps BOOST_ALL_DYN_LINK;__LITTLE_ENDIAN__;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; @@ -313,7 +313,7 @@ MaxSpeed true true - $(ProjectDir)..\..\..\..\thirdparty\eprosima-common-code;$(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\eprosimartps + $(ProjectDir)..\..\..\..\thirdparty\eprosima-common-code;$(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\fastrtps BOOST_ALL_DYN_LINK;__LITTLE_ENDIAN__;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; false @@ -328,104 +328,104 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win32VS2010/cpp/eRTPS/eRTPS/eRTPS.vcxproj.filters b/win32VS2010/cpp/eRTPS/eRTPS/eRTPS.vcxproj.filters index 5022ee25c07..5c173481cf6 100644 --- a/win32VS2010/cpp/eRTPS/eRTPS/eRTPS.vcxproj.filters +++ b/win32VS2010/cpp/eRTPS/eRTPS/eRTPS.vcxproj.filters @@ -13,7 +13,7 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - + {789a2c91-9f6e-40f0-9d67-f8c2e15803c8} @@ -34,28 +34,28 @@ {5ae918d0-8a5d-439d-b627-18ac1fae51ec} - + {23f96963-03fc-42ad-b96f-721e8d739ae4} - + {6985c5ae-5e52-4dc4-bca7-911bda99cc4b} - + {a903d1e7-5613-4567-ace8-5ec75171dd31} - + {ebf9dad4-2ca0-4eac-a687-eef1280b817d} - + {c8a8b59a-be6d-4a5d-8628-e6bc3f3d294c} - + {a2df7efb-bde0-4b77-b1e6-88bfb6389cc3} - + {0c24004b-2705-4789-9c4f-afbaacd55627} - + {f9487150-1a0b-4d44-9e8c-245c092ffd30} @@ -64,34 +64,34 @@ {979fdd8c-45ca-4765-9d53-854d8d92b33f} - + {7d389060-9274-40f2-9fde-008ddad09484} - + {0ac9dbc0-69f4-41b7-8d5c-8a592a1b4584} {bd823d71-838c-4fa9-89bd-c001a4e332c3} - + {f7230019-b5d5-4b82-a26e-a55645e29f66} - + {1a36c720-5acf-4183-94ba-668caf5b3535} - + {bf182005-aca2-407b-b17e-9fc1f2347ae4} - + {27e37cbd-d49c-4bca-9422-0c76d7a0a35c} - + {47c8b1c6-f5d7-44ca-a68c-3b8507227a55} - + {c15b6b9e-15f4-400e-88b9-839dd243983e} - + {ba3c58f9-9a83-45ef-9a17-f99457869884} @@ -119,10 +119,10 @@ {edceaed4-0018-4c0f-904c-48a7cb3d0fe3} - + {51fc8fce-070d-48fa-a579-933e4c337924} - + {4604a70b-119f-4b80-864f-c52965a43429} @@ -152,245 +152,245 @@ Source Files\submessages - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps\qos + + Header Files\fastrtps\qos - - Header Files\eprosimartps\qos + + Header Files\fastrtps\qos - - Header Files\eprosimartps\qos + + Header Files\fastrtps\qos - - Header Files\eprosimartps\qos + + Header Files\fastrtps\qos - - Header Files\eprosimartps\qos + + Header Files\fastrtps\qos - - Header Files\eprosimartps\reader + + Header Files\fastrtps\reader - - Header Files\eprosimartps\reader + + Header Files\fastrtps\reader - - Header Files\eprosimartps\reader + + Header Files\fastrtps\reader - - Header Files\eprosimartps\reader + + Header Files\fastrtps\reader - - Header Files\eprosimartps\resources + + Header Files\fastrtps\resources - - Header Files\eprosimartps\resources + + Header Files\fastrtps\resources - - Header Files\eprosimartps\resources + + Header Files\fastrtps\resources - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\writer + + Header Files\fastrtps\writer - - Header Files\eprosimartps\writer + + Header Files\fastrtps\writer - - Header Files\eprosimartps\writer + + Header Files\fastrtps\writer - - Header Files\eprosimartps\writer + + Header Files\fastrtps\writer - - Header Files\eprosimartps\writer + + Header Files\fastrtps\writer - - Header Files\eprosimartps\writer + + Header Files\fastrtps\writer - - Header Files\eprosimartps\common + + Header Files\fastrtps\common - - Header Files\eprosimartps\common + + Header Files\fastrtps\common - - Header Files\eprosimartps\common + + Header Files\fastrtps\common - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\writer\timedevent + + Header Files\fastrtps\writer\timedevent - - Header Files\eprosimartps\writer\timedevent + + Header Files\fastrtps\writer\timedevent - - Header Files\eprosimartps\writer\timedevent + + Header Files\fastrtps\writer\timedevent - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\reader\timedevent + + Header Files\fastrtps\reader\timedevent - - Header Files\eprosimartps\reader\timedevent + + Header Files\fastrtps\reader\timedevent - - Header Files\eprosimartps\history + + Header Files\fastrtps\history - - Header Files\eprosimartps\history + + Header Files\fastrtps\history - - Header Files\eprosimartps\history + + Header Files\fastrtps\history - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\builtin + + Header Files\fastrtps\builtin - - Header Files\eprosimartps\builtin\discovery\endpoint + + Header Files\fastrtps\builtin\discovery\endpoint - - Header Files\eprosimartps\builtin\discovery\endpoint + + Header Files\fastrtps\builtin\discovery\endpoint - - Header Files\eprosimartps\builtin\discovery\endpoint + + Header Files\fastrtps\builtin\discovery\endpoint - - Header Files\eprosimartps\builtin\discovery\endpoint + + Header Files\fastrtps\builtin\discovery\endpoint - - Header Files\eprosimartps\builtin\discovery\endpoint + + Header Files\fastrtps\builtin\discovery\endpoint - - Header Files\eprosimartps\builtin\discovery\RTPSParticipant + + Header Files\fastrtps\builtin\discovery\RTPSParticipant - - Header Files\eprosimartps\builtin\discovery\RTPSParticipant + + Header Files\fastrtps\builtin\discovery\RTPSParticipant - - Header Files\eprosimartps\builtin\discovery\RTPSParticipant + + Header Files\fastrtps\builtin\discovery\RTPSParticipant - - Header Files\eprosimartps\builtin\liveliness + + Header Files\fastrtps\builtin\liveliness - - Header Files\eprosimartps\builtin\liveliness + + Header Files\fastrtps\builtin\liveliness - - Header Files\eprosimartps\builtin\liveliness\timedevent + + Header Files\fastrtps\builtin\liveliness\timedevent - - Header Files\eprosimartps\builtin\discovery\RTPSParticipant\timedevent + + Header Files\fastrtps\builtin\discovery\RTPSParticipant\timedevent - - Header Files\eprosimartps\builtin\discovery\RTPSParticipant\timedevent + + Header Files\fastrtps\builtin\discovery\RTPSParticipant\timedevent - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps\writer + + Header Files\fastrtps\writer - - Header Files\eprosimartps\reader + + Header Files\fastrtps\reader - - Header Files\eprosimartps\builtin\discovery\endpoint + + Header Files\fastrtps\builtin\discovery\endpoint - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\builtin\liveliness + + Header Files\fastrtps\builtin\liveliness - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\writer\timedevent + + Header Files\fastrtps\writer\timedevent - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils @@ -399,66 +399,66 @@ Header Files\thirdparty\log - - Header Files\eprosimartps\dds + + Header Files\fastrtps\dds - - Header Files\eprosimartps\dds + + Header Files\fastrtps\dds - + Header Files - + Header Files - - Header Files\eprosimartps\qos + + Header Files\fastrtps\qos - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub\attributes + + Header Files\fastrtps\pubsub\attributes - - Header Files\eprosimartps\pubsub\attributes + + Header Files\fastrtps\pubsub\attributes - - Header Files\eprosimartps\pubsub\attributes + + Header Files\fastrtps\pubsub\attributes - - Header Files\eprosimartps\pubsub\attributes + + Header Files\fastrtps\pubsub\attributes - - Header Files\eprosimartps\pubsub\attributes + + Header Files\fastrtps\pubsub\attributes diff --git a/win32VS2013/cpp/eRTPS/copyHeaders.bat b/win32VS2013/cpp/eRTPS/copyHeaders.bat index 942296bd0f5..53c6e17ea95 100644 --- a/win32VS2013/cpp/eRTPS/copyHeaders.bat +++ b/win32VS2013/cpp/eRTPS/copyHeaders.bat @@ -1 +1 @@ -xcopy ..\..\..\include\eprosimartps\* "C:\Program Files\eProsima\eRTPS\include\eprosimartps\" /y /s \ No newline at end of file +xcopy ..\..\..\include\fastrtps\* "C:\Program Files\eProsima\eRTPS\include\fastrtps\" /y /s \ No newline at end of file diff --git a/win32VS2013/cpp/eRTPS/eRTPS.sln.bat b/win32VS2013/cpp/eRTPS/eRTPS.sln.bat index 3f969051cf1..880ae1ab4d2 100644 --- a/win32VS2013/cpp/eRTPS/eRTPS.sln.bat +++ b/win32VS2013/cpp/eRTPS/eRTPS.sln.bat @@ -1,10 +1,10 @@ :: This script execute Visual Studio getting first the version of the product. :: Get the current vesion of FastCDR -call %EPROSIMADIR%\scripts\common_pack_functions.bat :getVersionFromCPP VERSIONEPROSIMARTPS ..\..\..\include\eprosimartps\eprosimartps_version.h +call %EPROSIMADIR%\scripts\common_pack_functions.bat :getVersionFromCPP VERSIONfastrtps ..\..\..\include\fastrtps\fastrtps_version.h if not %errorstatus%==0 goto :EOF -set VERSION=-%VERSIONEPROSIMARTPS% +set VERSION=-%VERSIONfastrtps% set LIB_BOOST_PATH=C:\local\boost_1_57_0 diff --git a/win32VS2013/cpp/eRTPS/eRTPS/eRTPS.vcxproj b/win32VS2013/cpp/eRTPS/eRTPS/eRTPS.vcxproj index 8d1ba395ceb..87aa54d3973 100644 --- a/win32VS2013/cpp/eRTPS/eRTPS/eRTPS.vcxproj +++ b/win32VS2013/cpp/eRTPS/eRTPS/eRTPS.vcxproj @@ -226,76 +226,76 @@ $(ProjectDir)..\..\..\..\lib\i86Win32VS2013\ $(Platform)\$(Configuration)\ - libeprosimartpsd$(VERSION) + libfastrtpsd$(VERSION) $(ProjectDir)..\..\..\..\lib\i86Win32VS2010\ $(Platform)\$(Configuration)\ - libeprosimartpsd$(VERSION) + libfastrtpsd$(VERSION) $(ProjectDir)..\..\..\..\lib\x64Win64VS2013\ $(Platform)\$(Configuration)\ - libeprosimartpsd$(VERSION) + libfastrtpsd$(VERSION) $(ProjectDir)..\..\..\..\lib\x64Win64VS2010\ $(Platform)\$(Configuration)\ - libeprosimartpsd$(VERSION) + libfastrtpsd$(VERSION) $(ProjectDir)..\..\..\..\lib\i86Win32VS2013\ $(Platform)\$(Configuration)\ - eprosimartpsd$(VERSION) + fastrtpsd$(VERSION) .dll false $(ProjectDir)..\..\..\..\lib\i86Win32VS2010\ $(Platform)\$(Configuration)\ - eprosimartpsd$(VERSION) + fastrtpsd$(VERSION) .dll false $(ProjectDir)..\..\..\..\lib\x64Win64VS2013\ $(Platform)\$(Configuration)\ - eprosimartpsd$(VERSION) + fastrtpsd$(VERSION) .dll false $(ProjectDir)..\..\..\..\lib\x64Win64VS2010\ $(Platform)\$(Configuration)\ - eprosimartpsd$(VERSION) + fastrtpsd$(VERSION) .dll false $(ProjectDir)..\..\..\..\lib\i86Win32VS2010\ $(Platform)\$(Configuration)\ - eprosimartps$(VERSION) + fastrtps$(VERSION) .dll false $(ProjectDir)..\..\..\..\lib\i86Win32VS2010\ $(Platform)\$(Configuration)\ - eprosimartps$(VERSION) + fastrtps$(VERSION) .dll false $(ProjectDir)..\..\..\..\lib\x64Win64VS2010\ $(Platform)\$(Configuration)\ - eprosimartps$(VERSION) + fastrtps$(VERSION) .dll false $(ProjectDir)..\..\..\..\lib\x64Win64VS2010\ $(Platform)\$(Configuration)\ - eprosimartps$(VERSION) + fastrtps$(VERSION) .dll false @@ -324,22 +324,22 @@ $(Platform)\$(Configuration)\ - libeprosimartps$(VERSION) + libfastrtps$(VERSION) - libeprosimartps$(VERSION) + libfastrtps$(VERSION) - libeprosimartps$(VERSION) + libfastrtps$(VERSION) - libeprosimartps$(VERSION) + libfastrtps$(VERSION) Level3 Disabled - $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\eprosimartps + $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\fastrtps BOOST_ALL_DYN_LINK;__DEBUG;__LITTLE_ENDIAN__;_WIN32;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; EditAndContinue MultiThreadedDebugDLL @@ -361,7 +361,7 @@ Level3 Disabled - $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\eprosimartps + $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\fastrtps BOOST_ALL_DYN_LINK;__DEBUG;__LITTLE_ENDIAN__;_WIN32;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; EditAndContinue MultiThreadedDebugDLL @@ -383,7 +383,7 @@ Level3 Disabled - $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\eprosimartps + $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\fastrtps BOOST_ALL_DYN_LINK;__DEBUG;__LITTLE_ENDIAN__;_WIN32;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; @@ -402,7 +402,7 @@ Level3 Disabled - $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\eprosimartps + $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\fastrtps BOOST_ALL_DYN_LINK;__DEBUG;__LITTLE_ENDIAN__;_WIN32;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; @@ -422,7 +422,7 @@ Level3 Disabled $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(EPROSIMADIR)\code;%(AdditionalIncludeDirectories) - BOOST_ALL_DYN_LINK;__DEBUG;__LITTLE_ENDIAN__;_WIN32;EPROSIMARTPS_SOURCE;EPROSIMARTPS_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; + BOOST_ALL_DYN_LINK;__DEBUG;__LITTLE_ENDIAN__;_WIN32;fastrtps_SOURCE;fastrtps_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; true @@ -438,7 +438,7 @@ Level3 Disabled $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(EPROSIMADIR)\code;%(AdditionalIncludeDirectories) - BOOST_ALL_DYN_LINK;__DEBUG;__LITTLE_ENDIAN__;_WIN32;EPROSIMARTPS_SOURCE;EPROSIMARTPS_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; + BOOST_ALL_DYN_LINK;__DEBUG;__LITTLE_ENDIAN__;_WIN32;fastrtps_SOURCE;fastrtps_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; true @@ -454,7 +454,7 @@ Level3 Disabled $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(EPROSIMADIR)\code;%(AdditionalIncludeDirectories) - BOOST_ALL_DYN_LINK;__DEBUG;__LITTLE_ENDIAN__;_WIN32;EPROSIMARTPS_SOURCE;EPROSIMARTPS_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; + BOOST_ALL_DYN_LINK;__DEBUG;__LITTLE_ENDIAN__;_WIN32;fastrtps_SOURCE;fastrtps_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; true @@ -470,7 +470,7 @@ Level3 Disabled $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(EPROSIMADIR)\code;%(AdditionalIncludeDirectories) - BOOST_ALL_DYN_LINK;__DEBUG;__LITTLE_ENDIAN__;_WIN32;EPROSIMARTPS_SOURCE;EPROSIMARTPS_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; + BOOST_ALL_DYN_LINK;__DEBUG;__LITTLE_ENDIAN__;_WIN32;fastrtps_SOURCE;fastrtps_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; true @@ -486,7 +486,7 @@ Level3 Disabled $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(EPROSIMADIR)\code;%(AdditionalIncludeDirectories) - ;__LITTLE_ENDIAN__;_WIN32;EPROSIMARTPS_SOURCE;EPROSIMARTPS_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; + ;__LITTLE_ENDIAN__;_WIN32;fastrtps_SOURCE;fastrtps_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; MultiThreadedDLL Default @@ -503,7 +503,7 @@ Level3 Disabled $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(EPROSIMADIR)\code;%(AdditionalIncludeDirectories) - ;__LITTLE_ENDIAN__;_WIN32;EPROSIMARTPS_SOURCE;EPROSIMARTPS_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; + ;__LITTLE_ENDIAN__;_WIN32;fastrtps_SOURCE;fastrtps_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; MultiThreadedDLL Default @@ -520,7 +520,7 @@ Level3 Disabled $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(EPROSIMADIR)\code;%(AdditionalIncludeDirectories) - __LITTLE_ENDIAN__;_WIN32;EPROSIMARTPS_SOURCE;EPROSIMARTPS_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; + __LITTLE_ENDIAN__;_WIN32;fastrtps_SOURCE;fastrtps_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; MultiThreadedDLL Default @@ -537,7 +537,7 @@ Level3 Disabled $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(EPROSIMADIR)\code;%(AdditionalIncludeDirectories) - __LITTLE_ENDIAN__;_WIN32;EPROSIMARTPS_SOURCE;EPROSIMARTPS_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; + __LITTLE_ENDIAN__;_WIN32;fastrtps_SOURCE;fastrtps_DYN_LINK;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; MultiThreadedDLL Default @@ -555,7 +555,7 @@ MaxSpeed true false - $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\eprosimartps + $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\fastrtps BOOST_ALL_DYN_LINK;__LITTLE_ENDIAN__;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; @@ -581,7 +581,7 @@ MaxSpeed true false - $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\eprosimartps + $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\fastrtps BOOST_ALL_DYN_LINK;__LITTLE_ENDIAN__;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK; @@ -607,7 +607,7 @@ MaxSpeed true true - $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\eprosimartps + $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\fastrtps __LITTLE_ENDIAN__;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK false @@ -627,7 +627,7 @@ MaxSpeed true true - $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\eprosimartps + $(ProjectDir)..\..\..\..\include;$(LIB_BOOST_PATH);$(ProjectDir)..\..\..\..\include\fastrtps __LITTLE_ENDIAN__;%(PreprocessorDefinitions);_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK false @@ -642,105 +642,105 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win32VS2013/cpp/eRTPS/eRTPS/eRTPS.vcxproj.filters b/win32VS2013/cpp/eRTPS/eRTPS/eRTPS.vcxproj.filters index 78884bebe2c..c69a9888667 100644 --- a/win32VS2013/cpp/eRTPS/eRTPS/eRTPS.vcxproj.filters +++ b/win32VS2013/cpp/eRTPS/eRTPS/eRTPS.vcxproj.filters @@ -13,7 +13,7 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - + {789a2c91-9f6e-40f0-9d67-f8c2e15803c8} @@ -34,28 +34,28 @@ {5ae918d0-8a5d-439d-b627-18ac1fae51ec} - + {23f96963-03fc-42ad-b96f-721e8d739ae4} - + {6985c5ae-5e52-4dc4-bca7-911bda99cc4b} - + {a903d1e7-5613-4567-ace8-5ec75171dd31} - + {ebf9dad4-2ca0-4eac-a687-eef1280b817d} - + {c8a8b59a-be6d-4a5d-8628-e6bc3f3d294c} - + {a2df7efb-bde0-4b77-b1e6-88bfb6389cc3} - + {0c24004b-2705-4789-9c4f-afbaacd55627} - + {f9487150-1a0b-4d44-9e8c-245c092ffd30} @@ -64,34 +64,34 @@ {979fdd8c-45ca-4765-9d53-854d8d92b33f} - + {7d389060-9274-40f2-9fde-008ddad09484} - + {0ac9dbc0-69f4-41b7-8d5c-8a592a1b4584} {bd823d71-838c-4fa9-89bd-c001a4e332c3} - + {f7230019-b5d5-4b82-a26e-a55645e29f66} - + {1a36c720-5acf-4183-94ba-668caf5b3535} - + {bf182005-aca2-407b-b17e-9fc1f2347ae4} - + {27e37cbd-d49c-4bca-9422-0c76d7a0a35c} - + {47c8b1c6-f5d7-44ca-a68c-3b8507227a55} - + {c15b6b9e-15f4-400e-88b9-839dd243983e} - + {ba3c58f9-9a83-45ef-9a17-f99457869884} @@ -118,13 +118,13 @@ {edceaed4-0018-4c0f-904c-48a7cb3d0fe3} - + {51fc8fce-070d-48fa-a579-933e4c337924} - + {4604a70b-119f-4b80-864f-c52965a43429} - + {d70401c7-a21e-41fc-8009-83a4367e9b4c} @@ -144,302 +144,302 @@ Source Files\submessages - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps\qos + + Header Files\fastrtps\qos - - Header Files\eprosimartps\qos + + Header Files\fastrtps\qos - - Header Files\eprosimartps\qos + + Header Files\fastrtps\qos - - Header Files\eprosimartps\qos + + Header Files\fastrtps\qos - - Header Files\eprosimartps\qos + + Header Files\fastrtps\qos - - Header Files\eprosimartps\reader + + Header Files\fastrtps\reader - - Header Files\eprosimartps\reader + + Header Files\fastrtps\reader - - Header Files\eprosimartps\reader + + Header Files\fastrtps\reader - - Header Files\eprosimartps\reader + + Header Files\fastrtps\reader - - Header Files\eprosimartps\resources + + Header Files\fastrtps\resources - - Header Files\eprosimartps\resources + + Header Files\fastrtps\resources - - Header Files\eprosimartps\resources + + Header Files\fastrtps\resources - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\writer + + Header Files\fastrtps\writer - - Header Files\eprosimartps\writer + + Header Files\fastrtps\writer - - Header Files\eprosimartps\writer + + Header Files\fastrtps\writer - - Header Files\eprosimartps\writer + + Header Files\fastrtps\writer - - Header Files\eprosimartps\writer + + Header Files\fastrtps\writer - - Header Files\eprosimartps\writer + + Header Files\fastrtps\writer - - Header Files\eprosimartps\common + + Header Files\fastrtps\common - - Header Files\eprosimartps\common + + Header Files\fastrtps\common - - Header Files\eprosimartps\common + + Header Files\fastrtps\common - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\common\types + + Header Files\fastrtps\common\types - - Header Files\eprosimartps\writer\timedevent + + Header Files\fastrtps\writer\timedevent - - Header Files\eprosimartps\writer\timedevent + + Header Files\fastrtps\writer\timedevent - - Header Files\eprosimartps\writer\timedevent + + Header Files\fastrtps\writer\timedevent - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\reader\timedevent + + Header Files\fastrtps\reader\timedevent - - Header Files\eprosimartps\reader\timedevent + + Header Files\fastrtps\reader\timedevent - - Header Files\eprosimartps\history + + Header Files\fastrtps\history - - Header Files\eprosimartps\history + + Header Files\fastrtps\history - - Header Files\eprosimartps\history + + Header Files\fastrtps\history - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\builtin + + Header Files\fastrtps\builtin - - Header Files\eprosimartps\builtin\discovery\endpoint + + Header Files\fastrtps\builtin\discovery\endpoint - - Header Files\eprosimartps\builtin\discovery\endpoint + + Header Files\fastrtps\builtin\discovery\endpoint - - Header Files\eprosimartps\builtin\discovery\endpoint + + Header Files\fastrtps\builtin\discovery\endpoint - - Header Files\eprosimartps\builtin\discovery\endpoint + + Header Files\fastrtps\builtin\discovery\endpoint - - Header Files\eprosimartps\builtin\discovery\endpoint + + Header Files\fastrtps\builtin\discovery\endpoint - - Header Files\eprosimartps\builtin\discovery\RTPSParticipant + + Header Files\fastrtps\builtin\discovery\RTPSParticipant - - Header Files\eprosimartps\builtin\discovery\RTPSParticipant + + Header Files\fastrtps\builtin\discovery\RTPSParticipant - - Header Files\eprosimartps\builtin\discovery\RTPSParticipant + + Header Files\fastrtps\builtin\discovery\RTPSParticipant - - Header Files\eprosimartps\builtin\liveliness + + Header Files\fastrtps\builtin\liveliness - - Header Files\eprosimartps\builtin\liveliness + + Header Files\fastrtps\builtin\liveliness - - Header Files\eprosimartps\builtin\liveliness\timedevent + + Header Files\fastrtps\builtin\liveliness\timedevent - - Header Files\eprosimartps\builtin\discovery\RTPSParticipant\timedevent + + Header Files\fastrtps\builtin\discovery\RTPSParticipant\timedevent - - Header Files\eprosimartps\builtin\discovery\RTPSParticipant\timedevent + + Header Files\fastrtps\builtin\discovery\RTPSParticipant\timedevent - - Header Files\eprosimartps + + Header Files\fastrtps - - Header Files\eprosimartps\writer + + Header Files\fastrtps\writer - - Header Files\eprosimartps\reader + + Header Files\fastrtps\reader - - Header Files\eprosimartps\builtin\discovery\endpoint + + Header Files\fastrtps\builtin\discovery\endpoint - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\builtin\liveliness + + Header Files\fastrtps\builtin\liveliness - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - - Header Files\eprosimartps\writer\timedevent + + Header Files\fastrtps\writer\timedevent - - Header Files\eprosimartps\utils + + Header Files\fastrtps\utils - + Header Files - + Header Files - - Header Files\eprosimartps\qos + + Header Files\fastrtps\qos - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub + + Header Files\fastrtps\pubsub - - Header Files\eprosimartps\pubsub\attributes + + Header Files\fastrtps\pubsub\attributes - - Header Files\eprosimartps\pubsub\attributes + + Header Files\fastrtps\pubsub\attributes - - Header Files\eprosimartps\pubsub\attributes + + Header Files\fastrtps\pubsub\attributes - - Header Files\eprosimartps\pubsub\attributes + + Header Files\fastrtps\pubsub\attributes - - Header Files\eprosimartps\pubsub\attributes + + Header Files\fastrtps\pubsub\attributes - - Header Files\eprosimartps\rtps + + Header Files\fastrtps\rtps - - Header Files\eprosimartps\rtps + + Header Files\fastrtps\rtps - - Header Files\eprosimartps\rtps + + Header Files\fastrtps\rtps