From 1138367056b2f31fbe8c8c9b13852def1d9c9d17 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 11 Mar 2024 14:44:07 +0100 Subject: [PATCH 01/20] Refs #20568: Remove include/fastrtps/log Signed-off-by: EduPonz --- include/fastrtps/log/Colors.h | 19 --------------- include/fastrtps/log/FileConsumer.h | 33 --------------------------- include/fastrtps/log/Log.h | 30 ------------------------ include/fastrtps/log/StdoutConsumer.h | 28 ----------------------- 4 files changed, 110 deletions(-) delete mode 100644 include/fastrtps/log/Colors.h delete mode 100644 include/fastrtps/log/FileConsumer.h delete mode 100644 include/fastrtps/log/Log.h delete mode 100644 include/fastrtps/log/StdoutConsumer.h diff --git a/include/fastrtps/log/Colors.h b/include/fastrtps/log/Colors.h deleted file mode 100644 index f2422cbf97a..00000000000 --- a/include/fastrtps/log/Colors.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file Colors.h - */ - -#include diff --git a/include/fastrtps/log/FileConsumer.h b/include/fastrtps/log/FileConsumer.h deleted file mode 100644 index 5b515b78ba6..00000000000 --- a/include/fastrtps/log/FileConsumer.h +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file FileConsumer.h - * - */ - -#ifndef FILE_CONSUMER_H -#define FILE_CONSUMER_H - -#include - -namespace eprosima { -namespace fastrtps { - -using FileConsumer = fastdds::dds::FileConsumer; - -} // namespace fastrtps -} // namespace eprosima - -#endif // FILE_CONSUMER_H diff --git a/include/fastrtps/log/Log.h b/include/fastrtps/log/Log.h deleted file mode 100644 index 24fa9542657..00000000000 --- a/include/fastrtps/log/Log.h +++ /dev/null @@ -1,30 +0,0 @@ - -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#ifndef _FASTRTPS_LOG_LOG_H_ -#define _FASTRTPS_LOG_LOG_H_ - -#include - -namespace eprosima { -namespace fastrtps { - -using LogConsumer = fastdds::dds::LogConsumer; -using Log = fastdds::dds::Log; - -} // namespace fastrtps -} // namespace eprosima - -#endif diff --git a/include/fastrtps/log/StdoutConsumer.h b/include/fastrtps/log/StdoutConsumer.h deleted file mode 100644 index 8e2cd41bcb9..00000000000 --- a/include/fastrtps/log/StdoutConsumer.h +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef STDOUT_CONSUMER_H -#define STDOUT_CONSUMER_H - -#include - -namespace eprosima { -namespace fastrtps { - -using StdoutConsumer = fastdds::dds::StdoutConsumer; - -} // namespace fastrtps -} // namespace eprosima - -#endif From ff4357309e3e4195c0a89befc3840002d173e821 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 11 Mar 2024 14:46:44 +0100 Subject: [PATCH 02/20] Refs #20568: Remove include/fastrtps/transport Signed-off-by: EduPonz --- .../transport/SocketTransportDescriptor.h | 31 --------------- .../transport/TCPTransportDescriptor.h | 32 --------------- .../transport/TCPv4TransportDescriptor.h | 32 --------------- .../transport/TCPv6TransportDescriptor.h | 32 --------------- .../transport/TransportDescriptorInterface.h | 31 --------------- .../fastrtps/transport/TransportInterface.h | 39 ------------------- .../transport/TransportReceiverInterface.h | 30 -------------- .../transport/UDPTransportDescriptor.h | 32 --------------- .../transport/UDPv4TransportDescriptor.h | 32 --------------- .../transport/UDPv6TransportDescriptor.h | 32 --------------- .../transport/test_UDPv4TransportDescriptor.h | 32 --------------- src/cpp/xmlparser/XMLElementParser.cpp | 5 ++- test/blackbox/common/BlackboxTestsKeys.cpp | 2 +- .../common/DDSBlackboxTestsDataReader.cpp | 2 +- 14 files changed, 5 insertions(+), 359 deletions(-) delete mode 100644 include/fastrtps/transport/SocketTransportDescriptor.h delete mode 100644 include/fastrtps/transport/TCPTransportDescriptor.h delete mode 100644 include/fastrtps/transport/TCPv4TransportDescriptor.h delete mode 100644 include/fastrtps/transport/TCPv6TransportDescriptor.h delete mode 100644 include/fastrtps/transport/TransportDescriptorInterface.h delete mode 100644 include/fastrtps/transport/TransportInterface.h delete mode 100644 include/fastrtps/transport/TransportReceiverInterface.h delete mode 100644 include/fastrtps/transport/UDPTransportDescriptor.h delete mode 100644 include/fastrtps/transport/UDPv4TransportDescriptor.h delete mode 100644 include/fastrtps/transport/UDPv6TransportDescriptor.h delete mode 100644 include/fastrtps/transport/test_UDPv4TransportDescriptor.h diff --git a/include/fastrtps/transport/SocketTransportDescriptor.h b/include/fastrtps/transport/SocketTransportDescriptor.h deleted file mode 100644 index f3d290a4a36..00000000000 --- a/include/fastrtps/transport/SocketTransportDescriptor.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef SOCKET_TRANSPORT_DESCRIPTOR_H -#define SOCKET_TRANSPORT_DESCRIPTOR_H - -#include - -namespace eprosima{ -namespace fastrtps{ -namespace rtps{ - -using TransportInterface = fastdds::rtps::TransportInterface; -using SocketTransportDescriptor = fastdds::rtps::SocketTransportDescriptor; - -} // namespace rtps -} // namespace fastrtps -} // namespace eprosima - -#endif // SOCKET_TRANSPORT_DESCRIPTOR_H diff --git a/include/fastrtps/transport/TCPTransportDescriptor.h b/include/fastrtps/transport/TCPTransportDescriptor.h deleted file mode 100644 index 553e820064f..00000000000 --- a/include/fastrtps/transport/TCPTransportDescriptor.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2018 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef TCP_TRANSPORT_DESCRIPTOR_H -#define TCP_TRANSPORT_DESCRIPTOR_H - -#include - -#include - -namespace eprosima{ -namespace fastrtps{ -namespace rtps{ - -using TCPTransportDescriptor = fastdds::rtps::TCPTransportDescriptor; - -} // namespace rtps -} // namespace fastrtps -} // namespace eprosima - -#endif // TCP_TRANSPORT_DESCRIPTOR_H diff --git a/include/fastrtps/transport/TCPv4TransportDescriptor.h b/include/fastrtps/transport/TCPv4TransportDescriptor.h deleted file mode 100644 index ebaaca770f2..00000000000 --- a/include/fastrtps/transport/TCPv4TransportDescriptor.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef TCPV4_TRANSPORT_DESCRIPTOR -#define TCPV4_TRANSPORT_DESCRIPTOR - -#include - -#include - -namespace eprosima{ -namespace fastrtps{ -namespace rtps{ - -using TCPv4TransportDescriptor = fastdds::rtps::TCPv4TransportDescriptor; - -} // namespace rtps -} // namespace fastrtps -} // namespace eprosima - -#endif diff --git a/include/fastrtps/transport/TCPv6TransportDescriptor.h b/include/fastrtps/transport/TCPv6TransportDescriptor.h deleted file mode 100644 index 522ab890522..00000000000 --- a/include/fastrtps/transport/TCPv6TransportDescriptor.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2018 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef TCPV6_TRANSPORT_DESCRIPTOR -#define TCPV6_TRANSPORT_DESCRIPTOR - -#include - -#include - -namespace eprosima{ -namespace fastrtps{ -namespace rtps{ - -using TCPv6TransportDescriptor = fastdds::rtps::TCPv6TransportDescriptor; - -} // namespace rtps -} // namespace fastrtps -} // namespace eprosima - -#endif diff --git a/include/fastrtps/transport/TransportDescriptorInterface.h b/include/fastrtps/transport/TransportDescriptorInterface.h deleted file mode 100644 index ca6ae8a2c61..00000000000 --- a/include/fastrtps/transport/TransportDescriptorInterface.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef TRANSPORT_DESCRIPTOR_INTERFACE_H -#define TRANSPORT_DESCRIPTOR_INTERFACE_H - -#include - -namespace eprosima{ -namespace fastrtps{ -namespace rtps{ - -using TransportInterface = fastdds::rtps::TransportInterface; -using TransportDescriptorInterface = fastdds::rtps::TransportDescriptorInterface; - -} // namespace rtps -} // namespace fastrtps -} // namespace eprosima - -#endif //TRANSPORT_DESCRIPTOR_INTERFACE_H diff --git a/include/fastrtps/transport/TransportInterface.h b/include/fastrtps/transport/TransportInterface.h deleted file mode 100644 index 107a0d3db8b..00000000000 --- a/include/fastrtps/transport/TransportInterface.h +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef TRANSPORT_INTERFACE_H -#define TRANSPORT_INTERFACE_H - -#include -#include - -#include - -namespace eprosima { -namespace fastrtps { -namespace rtps { - -using SendResourceList = fastdds::rtps::SendResourceList; -using TransportInterface = fastdds::rtps::TransportInterface; - -static const uint32_t s_maximumMessageSize = fastdds::rtps::s_maximumMessageSize; -static const uint32_t s_maximumInitialPeersRange = fastdds::rtps::s_maximumInitialPeersRange; -static const std::string s_IPv4AddressAny = fastdds::rtps::s_IPv4AddressAny; -static const std::string s_IPv6AddressAny = fastdds::rtps::s_IPv6AddressAny; - -} // namespace rtps -} // namespace fastrtps -} // namespace eprosima - -#endif // ifndef TRANSPORT_INTERFACE_H diff --git a/include/fastrtps/transport/TransportReceiverInterface.h b/include/fastrtps/transport/TransportReceiverInterface.h deleted file mode 100644 index 8e720725fb3..00000000000 --- a/include/fastrtps/transport/TransportReceiverInterface.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef TRANSPORT_RECEIVER_INTERFACE_H -#define TRANSPORT_RECEIVER_INTERFACE_H - -#include - -namespace eprosima { -namespace fastrtps { -namespace rtps { - -using TransportReceiverInterface = fastdds::rtps::TransportReceiverInterface; - -} // namespace rtps -} // namespace fastrtps -} // namespace eprosima - -#endif diff --git a/include/fastrtps/transport/UDPTransportDescriptor.h b/include/fastrtps/transport/UDPTransportDescriptor.h deleted file mode 100644 index 1d778b132eb..00000000000 --- a/include/fastrtps/transport/UDPTransportDescriptor.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef UDP_TRANSPORT_DESCRIPTOR -#define UDP_TRANSPORT_DESCRIPTOR - -#include - -#include - -namespace eprosima{ -namespace fastrtps{ -namespace rtps{ - -using UDPTransportDescriptor = fastdds::rtps::UDPTransportDescriptor; - -} // namespace rtps -} // namespace fastrtps -} // namespace eprosima - -#endif // UDP_TRANSPORT_DESCRIPTOR diff --git a/include/fastrtps/transport/UDPv4TransportDescriptor.h b/include/fastrtps/transport/UDPv4TransportDescriptor.h deleted file mode 100644 index 835c24c9c37..00000000000 --- a/include/fastrtps/transport/UDPv4TransportDescriptor.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef UDPV4_TRANSPORT_DESCRIPTOR -#define UDPV4_TRANSPORT_DESCRIPTOR - -#include - -#include - -namespace eprosima { -namespace fastrtps { -namespace rtps { - -using UDPv4TransportDescriptor = fastdds::rtps::UDPv4TransportDescriptor; - -} // namespace rtps -} // namespace fastrtps -} // namespace eprosima - -#endif // ifndef UDPV4_TRANSPORT_DESCRIPTOR diff --git a/include/fastrtps/transport/UDPv6TransportDescriptor.h b/include/fastrtps/transport/UDPv6TransportDescriptor.h deleted file mode 100644 index 546dc81d5be..00000000000 --- a/include/fastrtps/transport/UDPv6TransportDescriptor.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef UDPV6_TRANSPORT_DESCRIPTOR -#define UDPV6_TRANSPORT_DESCRIPTOR - -#include - -#include - -namespace eprosima { -namespace fastrtps { -namespace rtps { - -using UDPv6TransportDescriptor = fastdds::rtps::UDPv6TransportDescriptor; - -} // namespace rtps -} // namespace fastrtps -} // namespace eprosima - -#endif // ifndef UDPV6_TRANSPORT_DESCRIPTOR diff --git a/include/fastrtps/transport/test_UDPv4TransportDescriptor.h b/include/fastrtps/transport/test_UDPv4TransportDescriptor.h deleted file mode 100644 index 878fb671c58..00000000000 --- a/include/fastrtps/transport/test_UDPv4TransportDescriptor.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef TEST_UDPV4_TRANSPORT_DESCRIPTOR -#define TEST_UDPV4_TRANSPORT_DESCRIPTOR - -#include - -#include - -namespace eprosima { -namespace fastrtps { -namespace rtps { - -using test_UDPv4TransportDescriptor = fastdds::rtps::test_UDPv4TransportDescriptor; - -} // namespace rtps -} // namespace fastrtps -} // namespace eprosima - -#endif // ifndef TEST_UDPV4_TRANSPORT_DESCRIPTOR diff --git a/src/cpp/xmlparser/XMLElementParser.cpp b/src/cpp/xmlparser/XMLElementParser.cpp index cf6849a2d5c..fc00f7d27a8 100644 --- a/src/cpp/xmlparser/XMLElementParser.cpp +++ b/src/cpp/xmlparser/XMLElementParser.cpp @@ -845,7 +845,7 @@ XMLP_ret XMLParser::getXMLPortParameters( XMLP_ret XMLParser::getXMLTransports( tinyxml2::XMLElement* elem, - std::vector>& transports, + std::vector>& transports, uint8_t /*ident*/) { /* @@ -874,7 +874,8 @@ XMLP_ret XMLParser::getXMLTransports( } else { - std::shared_ptr pDescriptor = XMLProfileManager::getTransportById(text); + std::shared_ptr pDescriptor = + XMLProfileManager::getTransportById(text); if (pDescriptor != nullptr) { transports.emplace_back(pDescriptor); diff --git a/test/blackbox/common/BlackboxTestsKeys.cpp b/test/blackbox/common/BlackboxTestsKeys.cpp index 7a55e9891e9..62c4b1bce30 100644 --- a/test/blackbox/common/BlackboxTestsKeys.cpp +++ b/test/blackbox/common/BlackboxTestsKeys.cpp @@ -17,7 +17,7 @@ #include "PubSubReader.hpp" #include "PubSubWriter.hpp" -#include +#include TEST(KeyedTopic, RegistrationNonKeyedFail) { diff --git a/test/blackbox/common/DDSBlackboxTestsDataReader.cpp b/test/blackbox/common/DDSBlackboxTestsDataReader.cpp index a8d70bea285..eaa9a5b86a6 100644 --- a/test/blackbox/common/DDSBlackboxTestsDataReader.cpp +++ b/test/blackbox/common/DDSBlackboxTestsDataReader.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "BlackboxTests.hpp" #include "PubSubParticipant.hpp" From 16f98d6916fbe09cc941d2805930a006f95ec240 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 11 Mar 2024 14:53:28 +0100 Subject: [PATCH 03/20] Refs #20568: Remove all possible from include/fastrtps/qos Signed-off-by: EduPonz --- include/fastrtps/qos/DeadlineMissedStatus.h | 35 ------------------- .../fastrtps/qos/IncompatibleQosStatus.hpp | 35 ------------------- .../fastrtps/qos/LivelinessChangedStatus.h | 32 ----------------- include/fastrtps/qos/LivelinessLostStatus.h | 24 ------------- include/fastrtps/qos/ReaderQos.h | 35 ------------------- include/fastrtps/qos/SampleRejectedStatus.hpp | 33 ----------------- include/fastrtps/qos/WriterQos.h | 35 ------------------- .../rtps/participant/RTPSParticipantImpl.cpp | 8 ++--- src/cpp/xmlparser/XMLElementParser.cpp | 4 +-- src/cpp/xmlparser/XMLParser.h | 4 +-- .../attributes/PublisherAttributes.hpp | 4 +-- .../attributes/SubscriberAttributes.hpp | 6 ++-- .../statistics/rtps/RTPSStatisticsTests.cpp | 4 +-- .../xmlparser/XMLElementParserTests.cpp | 1 + .../xmlparser/XMLProfileParserTests.cpp | 16 ++++----- .../xmlparser/wrapper/XMLParserTest.hpp | 1 + 16 files changed, 25 insertions(+), 252 deletions(-) delete mode 100644 include/fastrtps/qos/DeadlineMissedStatus.h delete mode 100644 include/fastrtps/qos/IncompatibleQosStatus.hpp delete mode 100644 include/fastrtps/qos/LivelinessChangedStatus.h delete mode 100644 include/fastrtps/qos/LivelinessLostStatus.h delete mode 100644 include/fastrtps/qos/ReaderQos.h delete mode 100644 include/fastrtps/qos/SampleRejectedStatus.hpp delete mode 100644 include/fastrtps/qos/WriterQos.h diff --git a/include/fastrtps/qos/DeadlineMissedStatus.h b/include/fastrtps/qos/DeadlineMissedStatus.h deleted file mode 100644 index a50117d9bbf..00000000000 --- a/include/fastrtps/qos/DeadlineMissedStatus.h +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file DeadlineMissedStatus.h - */ - -#ifndef _DEADLINE_MISSED_STATUS_H_ -#define _DEADLINE_MISSED_STATUS_H_ - -#include - -namespace eprosima { -namespace fastrtps { - -using DeadlineMissedStatus = fastdds::dds::DeadlineMissedStatus; - -typedef DeadlineMissedStatus OfferedDeadlineMissedStatus; -typedef DeadlineMissedStatus RequestedDeadlineMissedStatus; - -} //end of namespace -} //end of namespace eprosima - -#endif /* _DEADLINE_MISSED_STATUS_H_ */ diff --git a/include/fastrtps/qos/IncompatibleQosStatus.hpp b/include/fastrtps/qos/IncompatibleQosStatus.hpp deleted file mode 100644 index f339df08d6a..00000000000 --- a/include/fastrtps/qos/IncompatibleQosStatus.hpp +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file IncompatibleQosStatus.hpp - */ - -#ifndef _FASTRTPS_INCOMPATIBLE_QOS_STATUS_HPP_ -#define _FASTRTPS_INCOMPATIBLE_QOS_STATUS_HPP_ - -#include - -namespace eprosima { -namespace fastrtps { - -using IncompatibleQosStatus = fastdds::dds::IncompatibleQosStatus; - -typedef IncompatibleQosStatus RequestedIncompatibleQosStatus; -typedef IncompatibleQosStatus OfferedIncompatibleQosStatus; - -} //end of namespace fastrtps -} //end of namespace eprosima - -#endif // _FASTRTPS_INCOMPATIBLE_QOS_STATUS_HPP_ diff --git a/include/fastrtps/qos/LivelinessChangedStatus.h b/include/fastrtps/qos/LivelinessChangedStatus.h deleted file mode 100644 index 41e19939505..00000000000 --- a/include/fastrtps/qos/LivelinessChangedStatus.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file LivelinessChangedStatus.h - */ - -#ifndef _LIVELINESS_CHANGED_STATUS_H_ -#define _LIVELINESS_CHANGED_STATUS_H_ - -#include - -namespace eprosima { -namespace fastrtps { - -using LivelinessChangedStatus = fastdds::dds::LivelinessChangedStatus; - -} //end of namespace -} //end of namespace eprosima - -#endif /* _LIVELINESS_CHANGED_STATUS_H_ */ diff --git a/include/fastrtps/qos/LivelinessLostStatus.h b/include/fastrtps/qos/LivelinessLostStatus.h deleted file mode 100644 index 6aa0bb46845..00000000000 --- a/include/fastrtps/qos/LivelinessLostStatus.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file LivelinessLostStatus.h - */ - -#ifndef _LIVELINESS_LOST_STATUS_H_ -#define _LIVELINESS_LOST_STATUS_H_ - -#include - -#endif /* _LIVELINESS_LOST_STATUS_H_ */ diff --git a/include/fastrtps/qos/ReaderQos.h b/include/fastrtps/qos/ReaderQos.h deleted file mode 100644 index 747b3b9c106..00000000000 --- a/include/fastrtps/qos/ReaderQos.h +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file ReaderQos.h - * - */ - -#ifndef READERQOS_H_ -#define READERQOS_H_ - -#include - -#include // Needed for old enum constant values - -namespace eprosima { -namespace fastrtps { - -using ReaderQos = fastdds::dds::ReaderQos; - -} /* namespace */ -} /* namespace eprosima */ - -#endif /* READERQOS_H_ */ diff --git a/include/fastrtps/qos/SampleRejectedStatus.hpp b/include/fastrtps/qos/SampleRejectedStatus.hpp deleted file mode 100644 index 7990a9de912..00000000000 --- a/include/fastrtps/qos/SampleRejectedStatus.hpp +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file SampleRejectedStatus.hpp - */ - -#ifndef _FASTRTPS_SAMPLE_REJECTED_STATUS_HPP_ -#define _FASTRTPS_SAMPLE_REJECTED_STATUS_HPP_ - -#include - -namespace eprosima { -namespace fastrtps { - -using SampleRejectedStatusKind = fastdds::dds::SampleRejectedStatusKind; -using SampleRejectedStatus = fastdds::dds::SampleRejectedStatus; - -} //end of namespace fastrtps -} //end of namespace eprosima - -#endif // _FASTRTPS_SAMPLE_REJECTED_STATUS_HPP_ diff --git a/include/fastrtps/qos/WriterQos.h b/include/fastrtps/qos/WriterQos.h deleted file mode 100644 index 7d77f5c887e..00000000000 --- a/include/fastrtps/qos/WriterQos.h +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file WriterQos.h - * - */ - -#ifndef WRITERQOS_H_ -#define WRITERQOS_H_ - -#include - -#include // Needed for old enum constant values - -namespace eprosima { -namespace fastrtps { - -using WriterQos = fastdds::dds::WriterQos; - -} /* namespace */ -} /* namespace eprosima */ - -#endif /* WRITERQOS_H_ */ diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp index 92c2fb75ad1..fcfbaa8b314 100644 --- a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp +++ b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp @@ -1478,7 +1478,7 @@ void RTPSParticipantImpl::disableReader( bool RTPSParticipantImpl::registerWriter( RTPSWriter* Writer, const TopicAttributes& topicAtt, - const WriterQos& wqos) + const fastdds::dds::WriterQos& wqos) { return this->mp_builtinProtocols->addLocalWriter(Writer, topicAtt, wqos); } @@ -1486,7 +1486,7 @@ bool RTPSParticipantImpl::registerWriter( bool RTPSParticipantImpl::registerReader( RTPSReader* reader, const TopicAttributes& topicAtt, - const ReaderQos& rqos, + const fastdds::dds::ReaderQos& rqos, const fastdds::rtps::ContentFilterProperty* content_filter) { return this->mp_builtinProtocols->addLocalReader(reader, topicAtt, rqos, content_filter); @@ -1752,7 +1752,7 @@ void RTPSParticipantImpl::update_attributes( bool RTPSParticipantImpl::updateLocalWriter( RTPSWriter* Writer, const TopicAttributes& topicAtt, - const WriterQos& wqos) + const fastdds::dds::WriterQos& wqos) { return this->mp_builtinProtocols->updateLocalWriter(Writer, topicAtt, wqos); } @@ -1760,7 +1760,7 @@ bool RTPSParticipantImpl::updateLocalWriter( bool RTPSParticipantImpl::updateLocalReader( RTPSReader* reader, const TopicAttributes& topicAtt, - const ReaderQos& rqos, + const fastdds::dds::ReaderQos& rqos, const fastdds::rtps::ContentFilterProperty* content_filter) { return this->mp_builtinProtocols->updateLocalReader(reader, topicAtt, rqos, content_filter); diff --git a/src/cpp/xmlparser/XMLElementParser.cpp b/src/cpp/xmlparser/XMLElementParser.cpp index fc00f7d27a8..3ff68e71eda 100644 --- a/src/cpp/xmlparser/XMLElementParser.cpp +++ b/src/cpp/xmlparser/XMLElementParser.cpp @@ -1243,7 +1243,7 @@ XMLP_ret XMLParser::getXMLHistoryQosPolicy( XMLP_ret XMLParser::getXMLWriterQosPolicies( tinyxml2::XMLElement* elem, - WriterQos& qos, + fastdds::dds::WriterQos& qos, uint8_t ident) { /* @@ -1428,7 +1428,7 @@ XMLP_ret XMLParser::getXMLWriterQosPolicies( XMLP_ret XMLParser::getXMLReaderQosPolicies( tinyxml2::XMLElement* elem, - ReaderQos& qos, + fastdds::dds::ReaderQos& qos, uint8_t ident) { /* diff --git a/src/cpp/xmlparser/XMLParser.h b/src/cpp/xmlparser/XMLParser.h index fc1b5c00fe3..fe12c2a39a7 100644 --- a/src/cpp/xmlparser/XMLParser.h +++ b/src/cpp/xmlparser/XMLParser.h @@ -421,12 +421,12 @@ class XMLParser static XMLP_ret getXMLWriterQosPolicies( tinyxml2::XMLElement* elem, - WriterQos& qos, + fastdds::dds::WriterQos& qos, uint8_t ident); static XMLP_ret getXMLReaderQosPolicies( tinyxml2::XMLElement* elem, - ReaderQos& qos, + fastdds::dds::ReaderQos& qos, uint8_t ident); static XMLP_ret getXMLPublishModeQos( diff --git a/src/cpp/xmlparser/attributes/PublisherAttributes.hpp b/src/cpp/xmlparser/attributes/PublisherAttributes.hpp index d379a0ce8a4..cfda6b9175c 100644 --- a/src/cpp/xmlparser/attributes/PublisherAttributes.hpp +++ b/src/cpp/xmlparser/attributes/PublisherAttributes.hpp @@ -21,6 +21,7 @@ #include +#include #include #include #include @@ -28,7 +29,6 @@ #include #include #include -#include namespace eprosima { namespace fastdds { @@ -64,7 +64,7 @@ class PublisherAttributes fastrtps::TopicAttributes topic; //! QOS for the Publisher - fastrtps::WriterQos qos; + dds::WriterQos qos; //! Writer Attributes fastrtps::rtps::WriterTimes times; diff --git a/src/cpp/xmlparser/attributes/SubscriberAttributes.hpp b/src/cpp/xmlparser/attributes/SubscriberAttributes.hpp index ce3f3732156..7ff6976282c 100644 --- a/src/cpp/xmlparser/attributes/SubscriberAttributes.hpp +++ b/src/cpp/xmlparser/attributes/SubscriberAttributes.hpp @@ -19,14 +19,14 @@ #ifndef _FASTDDS_SUBSCRIBERATTRIBUTES_H_ #define _FASTDDS_SUBSCRIBERATTRIBUTES_H_ +#include #include #include #include #include -#include #include +#include #include -#include namespace eprosima { namespace fastdds { @@ -43,7 +43,7 @@ class SubscriberAttributes fastrtps::TopicAttributes topic; //! Reader QOs. - fastrtps::ReaderQos qos; + dds::ReaderQos qos; //! Times for a RELIABLE Reader fastrtps::rtps::ReaderTimes times; diff --git a/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp b/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp index 2bf525fe701..e80f5982c32 100644 --- a/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp +++ b/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp @@ -362,14 +362,14 @@ class RTPSStatisticsTestsImpl Tatt.topicDataType = data_type; Tatt.topicName = topic_name; - WriterQos Wqos; + dds::WriterQos Wqos; auto& watt = writer_->getAttributes(); Wqos.m_durability.durabilityKind(watt.durabilityKind); Wqos.m_reliability.kind = RELIABLE == watt.reliabilityKind ? RELIABLE_RELIABILITY_QOS : BEST_EFFORT_RELIABILITY_QOS; - ReaderQos Rqos; + dds::ReaderQos Rqos; auto& ratt = writer_->getAttributes(); Rqos.m_durability.durabilityKind(ratt.durabilityKind); Rqos.m_reliability.kind = diff --git a/test/unittest/xmlparser/XMLElementParserTests.cpp b/test/unittest/xmlparser/XMLElementParserTests.cpp index 190c552e2d9..692971bc48c 100644 --- a/test/unittest/xmlparser/XMLElementParserTests.cpp +++ b/test/unittest/xmlparser/XMLElementParserTests.cpp @@ -39,6 +39,7 @@ #include "wrapper/XMLParserTest.hpp" using namespace eprosima::fastdds::dds; +using namespace eprosima::fastdds::rtps; using namespace eprosima::fastrtps; using namespace eprosima::fastrtps::rtps; using namespace eprosima::testing; diff --git a/test/unittest/xmlparser/XMLProfileParserTests.cpp b/test/unittest/xmlparser/XMLProfileParserTests.cpp index d8e98b0554c..a85e1be58c6 100644 --- a/test/unittest/xmlparser/XMLProfileParserTests.cpp +++ b/test/unittest/xmlparser/XMLProfileParserTests.cpp @@ -845,7 +845,7 @@ TEST_P(XMLProfileParserTests, XMLParserPublisher) xmlparser::XMLProfileManager::fillPublisherAttributes(publisher_profile, publisher_atts)); TopicAttributes& pub_topic = publisher_atts.topic; - WriterQos& pub_qos = publisher_atts.qos; + dds::WriterQos& pub_qos = publisher_atts.qos; Locator_t locator; LocatorListIterator loc_list_it; WriterTimes& pub_times = publisher_atts.times; @@ -920,7 +920,7 @@ TEST_F(XMLProfileParserBasicTests, XMLParserPublisherDeprecated) xmlparser::XMLProfileManager::fillPublisherAttributes(publisher_profile, publisher_atts)); TopicAttributes& pub_topic = publisher_atts.topic; - WriterQos& pub_qos = publisher_atts.qos; + dds::WriterQos& pub_qos = publisher_atts.qos; Locator_t locator; LocatorListIterator loc_list_it; WriterTimes& pub_times = publisher_atts.times; @@ -993,7 +993,7 @@ TEST_P(XMLProfileParserTests, XMLParserDefaultPublisherProfile) xmlparser::XMLProfileManager::getDefaultPublisherAttributes(publisher_atts); TopicAttributes& pub_topic = publisher_atts.topic; - WriterQos& pub_qos = publisher_atts.qos; + dds::WriterQos& pub_qos = publisher_atts.qos; Locator_t locator; LocatorListIterator loc_list_it; WriterTimes& pub_times = publisher_atts.times; @@ -1066,7 +1066,7 @@ TEST_F(XMLProfileParserBasicTests, XMLParserDefaultPublisherProfileDeprecated) xmlparser::XMLProfileManager::getDefaultPublisherAttributes(publisher_atts); TopicAttributes& pub_topic = publisher_atts.topic; - WriterQos& pub_qos = publisher_atts.qos; + dds::WriterQos& pub_qos = publisher_atts.qos; Locator_t locator; LocatorListIterator loc_list_it; WriterTimes& pub_times = publisher_atts.times; @@ -1141,7 +1141,7 @@ TEST_P(XMLProfileParserTests, XMLParserSubscriber) xmlparser::XMLProfileManager::fillSubscriberAttributes(subscriber_profile, subscriber_atts)); TopicAttributes& sub_topic = subscriber_atts.topic; - ReaderQos& sub_qos = subscriber_atts.qos; + dds::ReaderQos& sub_qos = subscriber_atts.qos; Locator_t locator; LocatorListIterator loc_list_it; ReaderTimes& sub_times = subscriber_atts.times; @@ -1213,7 +1213,7 @@ TEST_F(XMLProfileParserBasicTests, XMLParserSubscriberDeprecated) xmlparser::XMLProfileManager::fillSubscriberAttributes(subscriber_profile, subscriber_atts)); TopicAttributes& sub_topic = subscriber_atts.topic; - ReaderQos& sub_qos = subscriber_atts.qos; + dds::ReaderQos& sub_qos = subscriber_atts.qos; Locator_t locator; LocatorListIterator loc_list_it; ReaderTimes& sub_times = subscriber_atts.times; @@ -1283,7 +1283,7 @@ TEST_P(XMLProfileParserTests, XMLParserDefaultSubscriberProfile) xmlparser::XMLProfileManager::getDefaultSubscriberAttributes(subscriber_atts); TopicAttributes& sub_topic = subscriber_atts.topic; - ReaderQos& sub_qos = subscriber_atts.qos; + dds::ReaderQos& sub_qos = subscriber_atts.qos; Locator_t locator; LocatorListIterator loc_list_it; ReaderTimes& sub_times = subscriber_atts.times; @@ -1353,7 +1353,7 @@ TEST_F(XMLProfileParserBasicTests, XMLParserDefaultSubscriberProfileDeprecated) xmlparser::XMLProfileManager::getDefaultSubscriberAttributes(subscriber_atts); TopicAttributes& sub_topic = subscriber_atts.topic; - ReaderQos& sub_qos = subscriber_atts.qos; + dds::ReaderQos& sub_qos = subscriber_atts.qos; Locator_t locator; LocatorListIterator loc_list_it; ReaderTimes& sub_times = subscriber_atts.times; diff --git a/test/unittest/xmlparser/wrapper/XMLParserTest.hpp b/test/unittest/xmlparser/wrapper/XMLParserTest.hpp index f6b54832a32..c4d351225cb 100644 --- a/test/unittest/xmlparser/wrapper/XMLParserTest.hpp +++ b/test/unittest/xmlparser/wrapper/XMLParserTest.hpp @@ -20,6 +20,7 @@ #include using namespace eprosima::fastdds; +using namespace eprosima::fastdds::dds; using namespace eprosima::fastrtps; using namespace eprosima::fastrtps::rtps; From 6dfa4581632ee0cd131ee9de4996ece586bf542a Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 11 Mar 2024 14:54:05 +0100 Subject: [PATCH 04/20] Refs #20568: Remove all possible from include/fastrtps/rtps/attributes Signed-off-by: EduPonz --- .../rtps/attributes/EndpointAttributes.h | 24 --------------- .../rtps/attributes/HistoryAttributes.h | 29 ------------------- .../fastrtps/rtps/attributes/PropertyPolicy.h | 23 --------------- .../RTPSParticipantAllocationAttributes.hpp | 24 --------------- .../attributes/RTPSParticipantAttributes.h | 24 --------------- .../rtps/attributes/ReaderAttributes.h | 25 ---------------- .../rtps/attributes/ServerAttributes.h | 25 ---------------- .../rtps/attributes/WriterAttributes.h | 24 --------------- 8 files changed, 198 deletions(-) delete mode 100644 include/fastrtps/rtps/attributes/EndpointAttributes.h delete mode 100644 include/fastrtps/rtps/attributes/HistoryAttributes.h delete mode 100644 include/fastrtps/rtps/attributes/PropertyPolicy.h delete mode 100644 include/fastrtps/rtps/attributes/RTPSParticipantAllocationAttributes.hpp delete mode 100644 include/fastrtps/rtps/attributes/RTPSParticipantAttributes.h delete mode 100644 include/fastrtps/rtps/attributes/ReaderAttributes.h delete mode 100644 include/fastrtps/rtps/attributes/ServerAttributes.h delete mode 100644 include/fastrtps/rtps/attributes/WriterAttributes.h diff --git a/include/fastrtps/rtps/attributes/EndpointAttributes.h b/include/fastrtps/rtps/attributes/EndpointAttributes.h deleted file mode 100644 index 93ff0470035..00000000000 --- a/include/fastrtps/rtps/attributes/EndpointAttributes.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file fastrtps/rtps/attributes/EndpointAttributes.h - */ - -#ifndef ENDPOINTATTRIBUTES_H_ -#define ENDPOINTATTRIBUTES_H_ - -#include - -#endif /* */ diff --git a/include/fastrtps/rtps/attributes/HistoryAttributes.h b/include/fastrtps/rtps/attributes/HistoryAttributes.h deleted file mode 100644 index ab71ccc545d..00000000000 --- a/include/fastrtps/rtps/attributes/HistoryAttributes.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC - -/** - * @file HistoryAttributes.h - * - */ - -#ifndef HISTORYATTRIBUTES_H_ -#define HISTORYATTRIBUTES_H_ - -#include - -#endif /* HISTORYATTRIBUTES_H_ */ - -#endif diff --git a/include/fastrtps/rtps/attributes/PropertyPolicy.h b/include/fastrtps/rtps/attributes/PropertyPolicy.h deleted file mode 100644 index 0a798b18a5e..00000000000 --- a/include/fastrtps/rtps/attributes/PropertyPolicy.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/*! - * @file PropertyPolicy.h - */ -#ifndef _RTPS_ATTRIBUTES_PROPERTYPOLICY_H_ -#define _RTPS_ATTRIBUTES_PROPERTYPOLICY_H_ - -#include - -#endif // _RTPS_ATTRIBUTES_PROPERTYPOLICY_H_ diff --git a/include/fastrtps/rtps/attributes/RTPSParticipantAllocationAttributes.hpp b/include/fastrtps/rtps/attributes/RTPSParticipantAllocationAttributes.hpp deleted file mode 100644 index c49a34c5589..00000000000 --- a/include/fastrtps/rtps/attributes/RTPSParticipantAllocationAttributes.hpp +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file RTPSParticipantAllocationAttributes.hpp - */ - -#ifndef _FASTRTPS_RTPS_RTPSPARTICIPANTALLOCATIONATTRIBUTES_HPP_ -#define _FASTRTPS_RTPS_RTPSPARTICIPANTALLOCATIONATTRIBUTES_HPP_ - -#include - -#endif /* _FASTRTPS_RTPS_RTPSPARTICIPANTALLOCATIONATTRIBUTES_HPP_ */ diff --git a/include/fastrtps/rtps/attributes/RTPSParticipantAttributes.h b/include/fastrtps/rtps/attributes/RTPSParticipantAttributes.h deleted file mode 100644 index 9da918673cf..00000000000 --- a/include/fastrtps/rtps/attributes/RTPSParticipantAttributes.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file RTPSParticipantAttributes.h - */ - -#ifndef _RTPSPARTICIPANTPARAMETERS_H_ -#define _RTPSPARTICIPANTPARAMETERS_H_ - -#include - -#endif /* _RTPSPARTICIPANTPARAMETERS_H_ */ diff --git a/include/fastrtps/rtps/attributes/ReaderAttributes.h b/include/fastrtps/rtps/attributes/ReaderAttributes.h deleted file mode 100644 index ec521b81061..00000000000 --- a/include/fastrtps/rtps/attributes/ReaderAttributes.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file ReaderAttributes.h - * - */ - -#ifndef FASTRTPS_RTPS_ATTRIBUTES_READERATTRIBUTES_H_ -#define FASTRTPS_RTPS_ATTRIBUTES_READERATTRIBUTES_H_ - -#include - -#endif /* FASTRTPS_RTPS_ATTRIBUTES_READERATTRIBUTES_H_ */ diff --git a/include/fastrtps/rtps/attributes/ServerAttributes.h b/include/fastrtps/rtps/attributes/ServerAttributes.h deleted file mode 100644 index 9978e86b016..00000000000 --- a/include/fastrtps/rtps/attributes/ServerAttributes.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file ServerAttributes.h - * - */ - -#ifndef SERVERATTRIBUTES_H_ -#define SERVERATTRIBUTES_H_ - -#include - -#endif /* SERVERATTRIBUTES_H_ */ diff --git a/include/fastrtps/rtps/attributes/WriterAttributes.h b/include/fastrtps/rtps/attributes/WriterAttributes.h deleted file mode 100644 index 0e5410ea424..00000000000 --- a/include/fastrtps/rtps/attributes/WriterAttributes.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file WriterAttributes.h - * - */ -#ifndef WRITERATTRIBUTES_H_ -#define WRITERATTRIBUTES_H_ - -#include - -#endif /* WRITERATTRIBUTES_H_ */ From 6d0746a328e7010643f386f0ff9b68811e11120d Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 11 Mar 2024 14:54:35 +0100 Subject: [PATCH 05/20] Refs #20568: Remove all possible from include/fastrtps/rtps/builtin Signed-off-by: EduPonz --- .../rtps/builtin/data/ParticipantProxyData.h | 25 ------------------- .../rtps/builtin/data/ReaderProxyData.h | 25 ------------------- .../rtps/builtin/data/WriterProxyData.h | 25 ------------------- 3 files changed, 75 deletions(-) delete mode 100644 include/fastrtps/rtps/builtin/data/ParticipantProxyData.h delete mode 100644 include/fastrtps/rtps/builtin/data/ReaderProxyData.h delete mode 100644 include/fastrtps/rtps/builtin/data/WriterProxyData.h diff --git a/include/fastrtps/rtps/builtin/data/ParticipantProxyData.h b/include/fastrtps/rtps/builtin/data/ParticipantProxyData.h deleted file mode 100644 index 89c797cb054..00000000000 --- a/include/fastrtps/rtps/builtin/data/ParticipantProxyData.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file ParticipantProxyData.h - * - */ - -#ifndef _RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_H_ -#define _RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_H_ - -#include - -#endif // _RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_H_ diff --git a/include/fastrtps/rtps/builtin/data/ReaderProxyData.h b/include/fastrtps/rtps/builtin/data/ReaderProxyData.h deleted file mode 100644 index fb5efc7df8e..00000000000 --- a/include/fastrtps/rtps/builtin/data/ReaderProxyData.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file ReaderProxyData.h - * - */ - -#ifndef _RTPS_BUILTIN_DATA_READERPROXYDATA_H_ -#define _RTPS_BUILTIN_DATA_READERPROXYDATA_H_ - -#include - -#endif // _RTPS_BUILTIN_DATA_READERPROXYDATA_H_ diff --git a/include/fastrtps/rtps/builtin/data/WriterProxyData.h b/include/fastrtps/rtps/builtin/data/WriterProxyData.h deleted file mode 100644 index ca9f53dc6b1..00000000000 --- a/include/fastrtps/rtps/builtin/data/WriterProxyData.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file WriterProxyData.h - * - */ - -#ifndef _RTPS_BUILTIN_DATA_WRITERPROXYDATA_H_ -#define _RTPS_BUILTIN_DATA_WRITERPROXYDATA_H_ - -#include - -#endif // _RTPS_BUILTIN_DATA_WRITERPROXYDATA_H_ From 73ad6ff6203be75495dcde0440cc87c3db28bac7 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 11 Mar 2024 14:56:41 +0100 Subject: [PATCH 06/20] Refs #20568: Remove all possible from include/fastrtps/rtps/common Signed-off-by: EduPonz --- include/fastrtps/rtps/common/BinaryProperty.h | 23 ----------------- include/fastrtps/rtps/common/CDRMessage_t.h | 24 ------------------ include/fastrtps/rtps/common/CacheChange.h | 24 ------------------ include/fastrtps/rtps/common/FragmentNumber.h | 24 ------------------ include/fastrtps/rtps/common/Guid.h | 24 ------------------ include/fastrtps/rtps/common/InstanceHandle.h | 24 ------------------ include/fastrtps/rtps/common/Locator.h | 24 ------------------ .../rtps/common/LocatorListComparisons.hpp | 24 ------------------ .../fastrtps/rtps/common/LocatorSelector.hpp | 24 ------------------ .../rtps/common/LocatorSelectorEntry.hpp | 24 ------------------ include/fastrtps/rtps/common/MatchingInfo.h | 25 ------------------- include/fastrtps/rtps/common/PortParameters.h | 24 ------------------ include/fastrtps/rtps/common/Property.h | 23 ----------------- .../fastrtps/rtps/common/RemoteLocators.hpp | 24 ------------------ include/fastrtps/rtps/common/SampleIdentity.h | 23 ----------------- include/fastrtps/rtps/common/SequenceNumber.h | 24 ------------------ include/fastrtps/rtps/common/Time_t.h | 24 ------------------ include/fastrtps/rtps/common/Token.h | 23 ----------------- include/fastrtps/rtps/common/Types.h | 24 ------------------ include/fastrtps/rtps/common/WriteParams.h | 23 ----------------- include/fastrtps/rtps/common/all_common.h | 24 ------------------ 21 files changed, 500 deletions(-) delete mode 100644 include/fastrtps/rtps/common/BinaryProperty.h delete mode 100644 include/fastrtps/rtps/common/CDRMessage_t.h delete mode 100644 include/fastrtps/rtps/common/CacheChange.h delete mode 100644 include/fastrtps/rtps/common/FragmentNumber.h delete mode 100644 include/fastrtps/rtps/common/Guid.h delete mode 100644 include/fastrtps/rtps/common/InstanceHandle.h delete mode 100644 include/fastrtps/rtps/common/Locator.h delete mode 100644 include/fastrtps/rtps/common/LocatorListComparisons.hpp delete mode 100644 include/fastrtps/rtps/common/LocatorSelector.hpp delete mode 100644 include/fastrtps/rtps/common/LocatorSelectorEntry.hpp delete mode 100644 include/fastrtps/rtps/common/MatchingInfo.h delete mode 100644 include/fastrtps/rtps/common/PortParameters.h delete mode 100644 include/fastrtps/rtps/common/Property.h delete mode 100644 include/fastrtps/rtps/common/RemoteLocators.hpp delete mode 100644 include/fastrtps/rtps/common/SampleIdentity.h delete mode 100644 include/fastrtps/rtps/common/SequenceNumber.h delete mode 100644 include/fastrtps/rtps/common/Time_t.h delete mode 100644 include/fastrtps/rtps/common/Token.h delete mode 100644 include/fastrtps/rtps/common/Types.h delete mode 100644 include/fastrtps/rtps/common/WriteParams.h delete mode 100644 include/fastrtps/rtps/common/all_common.h diff --git a/include/fastrtps/rtps/common/BinaryProperty.h b/include/fastrtps/rtps/common/BinaryProperty.h deleted file mode 100644 index ef320c64a7c..00000000000 --- a/include/fastrtps/rtps/common/BinaryProperty.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/*! - * @file BinaryProperty.h - */ -#ifndef _RTPS_COMMON_BINARYPROPERTY_H_ -#define _RTPS_COMMON_BINARYPROPERTY_H_ - -#include - -#endif // _RTPS_COMMON_BINARYPROPERTY_H_ diff --git a/include/fastrtps/rtps/common/CDRMessage_t.h b/include/fastrtps/rtps/common/CDRMessage_t.h deleted file mode 100644 index 2958348b2ca..00000000000 --- a/include/fastrtps/rtps/common/CDRMessage_t.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file CDRMessage_t.h - */ - -#ifndef CDRMESSAGE_T_H_ -#define CDRMESSAGE_T_H_ - -#include - -#endif /* CDRMESSAGE_T_H_ */ diff --git a/include/fastrtps/rtps/common/CacheChange.h b/include/fastrtps/rtps/common/CacheChange.h deleted file mode 100644 index 199b4cd32e1..00000000000 --- a/include/fastrtps/rtps/common/CacheChange.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file CacheChange.h - */ - -#ifndef CACHECHANGE_H_ -#define CACHECHANGE_H_ - -#include - -#endif /* CACHECHANGE_H_ */ diff --git a/include/fastrtps/rtps/common/FragmentNumber.h b/include/fastrtps/rtps/common/FragmentNumber.h deleted file mode 100644 index 29db27a8214..00000000000 --- a/include/fastrtps/rtps/common/FragmentNumber.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file FragmentNumber.h - */ - -#ifndef RPTS_ELEM_FRAGNUM_H_ -#define RPTS_ELEM_FRAGNUM_H_ - -#include - -#endif /* RPTS_ELEM_FRAGNUM_H_ */ diff --git a/include/fastrtps/rtps/common/Guid.h b/include/fastrtps/rtps/common/Guid.h deleted file mode 100644 index 37d3d6d9ee2..00000000000 --- a/include/fastrtps/rtps/common/Guid.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file Guid.h - */ - -#ifndef RTPS_GUID_H_ -#define RTPS_GUID_H_ - -#include - -#endif /* RTPS_GUID_H_ */ diff --git a/include/fastrtps/rtps/common/InstanceHandle.h b/include/fastrtps/rtps/common/InstanceHandle.h deleted file mode 100644 index fb6a8179e55..00000000000 --- a/include/fastrtps/rtps/common/InstanceHandle.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file InstanceHandle.h - */ - -#ifndef INSTANCEHANDLE_H_ -#define INSTANCEHANDLE_H_ - -#include - -#endif /* INSTANCEHANDLE_H_ */ diff --git a/include/fastrtps/rtps/common/Locator.h b/include/fastrtps/rtps/common/Locator.h deleted file mode 100644 index b8add989bb7..00000000000 --- a/include/fastrtps/rtps/common/Locator.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file Locator.h - */ - -#ifndef RTPS_ELEM_LOCATOR_H_ -#define RTPS_ELEM_LOCATOR_H_ - -#include - -#endif /* RTPS_ELEM_LOCATOR_H_ */ diff --git a/include/fastrtps/rtps/common/LocatorListComparisons.hpp b/include/fastrtps/rtps/common/LocatorListComparisons.hpp deleted file mode 100644 index 15697b26eac..00000000000 --- a/include/fastrtps/rtps/common/LocatorListComparisons.hpp +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file LocatorListComparisons.hpp - */ - -#ifndef FASTRTPS_RTPS_COMMON_LOCATORLISTCOMPARISONS_HPP_ -#define FASTRTPS_RTPS_COMMON_LOCATORLISTCOMPARISONS_HPP_ - -#include - -#endif /* FASTRTPS_RTPS_COMMON_LOCATORLISTCOMPARISONS_HPP_ */ diff --git a/include/fastrtps/rtps/common/LocatorSelector.hpp b/include/fastrtps/rtps/common/LocatorSelector.hpp deleted file mode 100644 index 2cd3d56966e..00000000000 --- a/include/fastrtps/rtps/common/LocatorSelector.hpp +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file LocatorSelector.hpp - */ - -#ifndef FASTRTPS_RTPS_COMMON_LOCATORSELECTOR_HPP_ -#define FASTRTPS_RTPS_COMMON_LOCATORSELECTOR_HPP_ - -#include - -#endif /* FASTRTPS_RTPS_COMMON_LOCATORSELECTOR_H_ */ diff --git a/include/fastrtps/rtps/common/LocatorSelectorEntry.hpp b/include/fastrtps/rtps/common/LocatorSelectorEntry.hpp deleted file mode 100644 index b4b9703aba2..00000000000 --- a/include/fastrtps/rtps/common/LocatorSelectorEntry.hpp +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file LocatorSelectorEntry.hpp - */ - -#ifndef FASTRTPS_RTPS_COMMON_LOCATORSELECTORENTRY_HPP_ -#define FASTRTPS_RTPS_COMMON_LOCATORSELECTORENTRY_HPP_ - -#include - -#endif /* FASTRTPS_RTPS_COMMON_LOCATORSELECTORENTRY_HPP_ */ diff --git a/include/fastrtps/rtps/common/MatchingInfo.h b/include/fastrtps/rtps/common/MatchingInfo.h deleted file mode 100644 index de99d2e407b..00000000000 --- a/include/fastrtps/rtps/common/MatchingInfo.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file MatchingInfo.h - * - */ - -#ifndef MATCHINGINFO_H_ -#define MATCHINGINFO_H_ - -#include - -#endif /* MATCHINGINFO_H_ */ diff --git a/include/fastrtps/rtps/common/PortParameters.h b/include/fastrtps/rtps/common/PortParameters.h deleted file mode 100644 index 48a9454bd26..00000000000 --- a/include/fastrtps/rtps/common/PortParameters.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file PortParameters.h - */ - -#ifndef _PORT_PARAMETERS_H_ -#define _PORT_PARAMETERS_H_ - -#include - -#endif /* _PORT_PARAMETERS_H_ */ diff --git a/include/fastrtps/rtps/common/Property.h b/include/fastrtps/rtps/common/Property.h deleted file mode 100644 index 024da1d3e23..00000000000 --- a/include/fastrtps/rtps/common/Property.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/*! - * @file Property.h - */ -#ifndef _RTPS_COMMON_PROPERTYQOS_H_ -#define _RTPS_COMMON_PROPERTYQOS_H_ - -#include - -#endif // _RTPS_COMMON_PROPERTYQOS_H_ diff --git a/include/fastrtps/rtps/common/RemoteLocators.hpp b/include/fastrtps/rtps/common/RemoteLocators.hpp deleted file mode 100644 index 80bf8842f12..00000000000 --- a/include/fastrtps/rtps/common/RemoteLocators.hpp +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file RemoteLocators.hpp - */ - -#ifndef FASTRTPS_RTPS_COMMON_REMOTELOCATORS_HPP_ -#define FASTRTPS_RTPS_COMMON_REMOTELOCATORS_HPP_ - -#include - -#endif /* FASTRTPS_RTPS_COMMON_REMOTELOCATORS_HPP_ */ diff --git a/include/fastrtps/rtps/common/SampleIdentity.h b/include/fastrtps/rtps/common/SampleIdentity.h deleted file mode 100644 index 7b88c301290..00000000000 --- a/include/fastrtps/rtps/common/SampleIdentity.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file SampleIdentity.h - */ -#ifndef _FASTRTPS_RTPS_COMMON_SAMPLEIDENTITY_H_ -#define _FASTRTPS_RTPS_COMMON_SAMPLEIDENTITY_H_ - -#include - -#endif // _FASTRTPS_RTPS_COMMON_SAMPLEIDENTITY_H_ diff --git a/include/fastrtps/rtps/common/SequenceNumber.h b/include/fastrtps/rtps/common/SequenceNumber.h deleted file mode 100644 index 3c5feb04d83..00000000000 --- a/include/fastrtps/rtps/common/SequenceNumber.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file SequenceNumber.h - */ - -#ifndef RPTS_ELEM_SEQNUM_H_ -#define RPTS_ELEM_SEQNUM_H_ - -#include - -#endif /* RPTS_ELEM_SEQNUM_H_ */ diff --git a/include/fastrtps/rtps/common/Time_t.h b/include/fastrtps/rtps/common/Time_t.h deleted file mode 100644 index ab486af2ed2..00000000000 --- a/include/fastrtps/rtps/common/Time_t.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file Time_t.h - */ - -#ifndef TIME_T_H_ -#define TIME_T_H_ - -#include - -#endif /* TIME_T_H_ */ diff --git a/include/fastrtps/rtps/common/Token.h b/include/fastrtps/rtps/common/Token.h deleted file mode 100644 index 547dde99f3d..00000000000 --- a/include/fastrtps/rtps/common/Token.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/*! - * @file Token.h - */ -#ifndef _RTPS_COMMON_TOKEN_H_ -#define _RTPS_COMMON_TOKEN_H_ - -#include - -#endif // _RTPS_COMMON_TOKEN_H_ diff --git a/include/fastrtps/rtps/common/Types.h b/include/fastrtps/rtps/common/Types.h deleted file mode 100644 index feba6638caa..00000000000 --- a/include/fastrtps/rtps/common/Types.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file Types.h - */ - -#ifndef COMMON_TYPES_H_ -#define COMMON_TYPES_H_ - -#include - -#endif /* COMMON_TYPES_H_ */ diff --git a/include/fastrtps/rtps/common/WriteParams.h b/include/fastrtps/rtps/common/WriteParams.h deleted file mode 100644 index 477dd7175a4..00000000000 --- a/include/fastrtps/rtps/common/WriteParams.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file WriteParams.h - */ -#ifndef _FASTRTPS_RTPS_COMMON_WRITEPARAMS_H_ -#define _FASTRTPS_RTPS_COMMON_WRITEPARAMS_H_ - -#include - -#endif //_FASTRTPS_RTPS_COMMON_WRITEPARAMS_H_ diff --git a/include/fastrtps/rtps/common/all_common.h b/include/fastrtps/rtps/common/all_common.h deleted file mode 100644 index 271b5e6d715..00000000000 --- a/include/fastrtps/rtps/common/all_common.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file all_common.h - */ - -#ifndef FASTRTPS_ALL_COMMON_H_ -#define FASTRTPS_ALL_COMMON_H_ - -#include - -#endif /* FASTRTPS_ALL_COMMON_H_ */ From 12d2c31f549427a5c8063571b101ef9ea9321f21 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 11 Mar 2024 14:57:33 +0100 Subject: [PATCH 07/20] Refs #20568: Remove all possible from include/fastrtps/rtps/exceptions Signed-off-by: EduPonz --- include/fastrtps/rtps/exceptions/Exception.h | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 include/fastrtps/rtps/exceptions/Exception.h diff --git a/include/fastrtps/rtps/exceptions/Exception.h b/include/fastrtps/rtps/exceptions/Exception.h deleted file mode 100644 index 7106c393715..00000000000 --- a/include/fastrtps/rtps/exceptions/Exception.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef _RTPS_EXCEPTIONS_EXCEPTION_H_ -#define _RTPS_EXCEPTIONS_EXCEPTION_H_ - -#include - -#endif // _RTPS_EXCEPTIONS_EXCEPTION_H_ From 813f7a2e0439af4b805759efffd41c4387d3ff02 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 11 Mar 2024 14:58:00 +0100 Subject: [PATCH 08/20] Refs #20568: Remove all possible from include/fastrtps/rtps/flowcontrol Signed-off-by: EduPonz --- .../ThroughputControllerDescriptor.h | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 include/fastrtps/rtps/flowcontrol/ThroughputControllerDescriptor.h diff --git a/include/fastrtps/rtps/flowcontrol/ThroughputControllerDescriptor.h b/include/fastrtps/rtps/flowcontrol/ThroughputControllerDescriptor.h deleted file mode 100644 index 7acead627e1..00000000000 --- a/include/fastrtps/rtps/flowcontrol/ThroughputControllerDescriptor.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef THROUGHPUT_CONTROLLER_DESCRIPTOR_H -#define THROUGHPUT_CONTROLLER_DESCRIPTOR_H - -#include - -#endif // THROUGHPUT_CONTROLLER_DESCRIPTOR_H From 530f96a70d6c18a045480f28997752e6dcd7c0c3 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 11 Mar 2024 14:58:14 +0100 Subject: [PATCH 09/20] Refs #20568: Remove all possible from include/fastrtps/rtps/history Signed-off-by: EduPonz --- include/fastrtps/rtps/history/History.h | 25 ------------------- include/fastrtps/rtps/history/ReaderHistory.h | 25 ------------------- include/fastrtps/rtps/history/WriterHistory.h | 25 ------------------- 3 files changed, 75 deletions(-) delete mode 100644 include/fastrtps/rtps/history/History.h delete mode 100644 include/fastrtps/rtps/history/ReaderHistory.h delete mode 100644 include/fastrtps/rtps/history/WriterHistory.h diff --git a/include/fastrtps/rtps/history/History.h b/include/fastrtps/rtps/history/History.h deleted file mode 100644 index cd5501b86b4..00000000000 --- a/include/fastrtps/rtps/history/History.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file History.h - * - */ - -#ifndef HISTORY_H_ -#define HISTORY_H_ - -#include - -#endif /* HISTORY_H_ */ diff --git a/include/fastrtps/rtps/history/ReaderHistory.h b/include/fastrtps/rtps/history/ReaderHistory.h deleted file mode 100644 index db43f349800..00000000000 --- a/include/fastrtps/rtps/history/ReaderHistory.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file ReaderHistory.h - * - */ - -#ifndef READERHISTORY_H_ -#define READERHISTORY_H_ - -#include - -#endif /* READERHISTORY_H_ */ diff --git a/include/fastrtps/rtps/history/WriterHistory.h b/include/fastrtps/rtps/history/WriterHistory.h deleted file mode 100644 index 07decb2429b..00000000000 --- a/include/fastrtps/rtps/history/WriterHistory.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file WriterHistory.h - * - */ - -#ifndef WRITERHISTORY_H_ -#define WRITERHISTORY_H_ - -#include - -#endif /* WRITERHISTORY_H_ */ From e44be773d09483520a465af425d8a4aab6238c13 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 11 Mar 2024 14:58:30 +0100 Subject: [PATCH 10/20] Refs #20568: Remove all possible from include/fastrtps/rtps/messages Signed-off-by: EduPonz --- include/fastrtps/rtps/messages/CDRMessage.h | 24 ------------------ .../rtps/messages/RTPSMessageCreator.h | 23 ----------------- .../fastrtps/rtps/messages/RTPSMessageGroup.h | 25 ------------------- .../messages/RTPSMessageSenderInterface.hpp | 25 ------------------- .../fastrtps/rtps/messages/RTPS_messages.h | 24 ------------------ 5 files changed, 121 deletions(-) delete mode 100644 include/fastrtps/rtps/messages/CDRMessage.h delete mode 100644 include/fastrtps/rtps/messages/RTPSMessageCreator.h delete mode 100644 include/fastrtps/rtps/messages/RTPSMessageGroup.h delete mode 100644 include/fastrtps/rtps/messages/RTPSMessageSenderInterface.hpp delete mode 100644 include/fastrtps/rtps/messages/RTPS_messages.h diff --git a/include/fastrtps/rtps/messages/CDRMessage.h b/include/fastrtps/rtps/messages/CDRMessage.h deleted file mode 100644 index 32f9a01500a..00000000000 --- a/include/fastrtps/rtps/messages/CDRMessage.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file CDRMessage.h - */ - -#ifndef CDRMESSAGE_H_ -#define CDRMESSAGE_H_ - -#include - -#endif /* CDRMESSAGE_H_ */ diff --git a/include/fastrtps/rtps/messages/RTPSMessageCreator.h b/include/fastrtps/rtps/messages/RTPSMessageCreator.h deleted file mode 100644 index 377e1a23142..00000000000 --- a/include/fastrtps/rtps/messages/RTPSMessageCreator.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file RTPSMessageCreator.h -*/ -#ifndef CDRMESSAGECREATOR_H_ -#define CDRMESSAGECREATOR_H_ - -#include - -#endif /* CDRMESSAGECREATOR_H_ */ diff --git a/include/fastrtps/rtps/messages/RTPSMessageGroup.h b/include/fastrtps/rtps/messages/RTPSMessageGroup.h deleted file mode 100644 index 61fed4ef39e..00000000000 --- a/include/fastrtps/rtps/messages/RTPSMessageGroup.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file RTPSMessageGroup.h - * - */ - -#ifndef RTPSMESSAGEGROUP_H_ -#define RTPSMESSAGEGROUP_H_ - -#include - -#endif /* RTPSMESSAGEGROUP_H_ */ diff --git a/include/fastrtps/rtps/messages/RTPSMessageSenderInterface.hpp b/include/fastrtps/rtps/messages/RTPSMessageSenderInterface.hpp deleted file mode 100644 index 209e0c0b932..00000000000 --- a/include/fastrtps/rtps/messages/RTPSMessageSenderInterface.hpp +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file RTPSMessageSenderInterface.hpp - * - */ - -#ifndef FASTRTPS_RTPS_MESSAGES_RTPSMESSAGESENDERINTERFACE_HPP_ -#define FASTRTPS_RTPS_MESSAGES_RTPSMESSAGESENDERINTERFACE_HPP_ - -#include - -#endif /* FASTRTPS_RTPS_MESSAGES_RTPSMESSAGESENDERINTERFACE_HPP_ */ diff --git a/include/fastrtps/rtps/messages/RTPS_messages.h b/include/fastrtps/rtps/messages/RTPS_messages.h deleted file mode 100644 index 3a1388e24f1..00000000000 --- a/include/fastrtps/rtps/messages/RTPS_messages.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file RTPS_messages.h - */ - -#ifndef RTPS_MESSAGES_H_ -#define RTPS_MESSAGES_H_ - -#include - -#endif /* RTPS_MESSAGES_H_ */ From 121ecd9c470553baa0d53828f91e079a89e930e5 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 11 Mar 2024 14:58:52 +0100 Subject: [PATCH 11/20] Refs #20568: Remove all possible from include/fastrtps/rtps/network Signed-off-by: EduPonz --- .../fastrtps/rtps/network/SenderResource.h | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 include/fastrtps/rtps/network/SenderResource.h diff --git a/include/fastrtps/rtps/network/SenderResource.h b/include/fastrtps/rtps/network/SenderResource.h deleted file mode 100644 index e62ce70e963..00000000000 --- a/include/fastrtps/rtps/network/SenderResource.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef _FASTRTPS_RTPS_NETWORK_SENDERRESOURCE_H_ -#define _FASTRTPS_RTPS_NETWORK_SENDERRESOURCE_H_ - -#include - -#endif /* _FASTRTPS_RTPS_NETWORK_SENDERRESOURCE_H_*/ From 94ba11fb42f9fa2ccee7366c3c389ca7e445ac08 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 11 Mar 2024 14:59:04 +0100 Subject: [PATCH 12/20] Refs #20568: Remove all possible from include/fastrtps/rtps/participant Signed-off-by: EduPonz --- .../participant/ParticipantDiscoveryInfo.h | 25 ------------------- .../rtps/participant/RTPSParticipant.h | 25 ------------------- .../participant/RTPSParticipantListener.h | 25 ------------------- 3 files changed, 75 deletions(-) delete mode 100644 include/fastrtps/rtps/participant/ParticipantDiscoveryInfo.h delete mode 100644 include/fastrtps/rtps/participant/RTPSParticipant.h delete mode 100644 include/fastrtps/rtps/participant/RTPSParticipantListener.h diff --git a/include/fastrtps/rtps/participant/ParticipantDiscoveryInfo.h b/include/fastrtps/rtps/participant/ParticipantDiscoveryInfo.h deleted file mode 100644 index cc0bbc872de..00000000000 --- a/include/fastrtps/rtps/participant/ParticipantDiscoveryInfo.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file ParticipantDiscoveryInfo.h - * - */ - -#ifndef __RTPS_PARTICIPANT_PARTICIPANTDISCOVERYINFO_H__ -#define __RTPS_PARTICIPANT_PARTICIPANTDISCOVERYINFO_H__ - -#include - -#endif // __RTPS_PARTICIPANT_PARTICIPANTDISCOVERYINFO_H__ diff --git a/include/fastrtps/rtps/participant/RTPSParticipant.h b/include/fastrtps/rtps/participant/RTPSParticipant.h deleted file mode 100644 index 96833d64eaa..00000000000 --- a/include/fastrtps/rtps/participant/RTPSParticipant.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file RTPSParticipant.h - */ - - -#ifndef RTPSParticipant_H_ -#define RTPSParticipant_H_ - -#include - -#endif /* RTPSParticipant_H_ */ diff --git a/include/fastrtps/rtps/participant/RTPSParticipantListener.h b/include/fastrtps/rtps/participant/RTPSParticipantListener.h deleted file mode 100644 index 2b09ea98dad..00000000000 --- a/include/fastrtps/rtps/participant/RTPSParticipantListener.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file RTPSParticipantListener.h - * - */ - -#ifndef __RTPS_PARTICIPANT_RTPSPARTICIPANTLISTENER_H__ -#define __RTPS_PARTICIPANT_RTPSPARTICIPANTLISTENER_H__ - -#include - -#endif //__RTPS_PARTICIPANT_RTPSPARTICIPANTLISTENER_H__ From f8ab0e713b1175e9ba9dc1bff580bfee3634dff9 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 11 Mar 2024 14:59:17 +0100 Subject: [PATCH 13/20] Refs #20568: Remove all possible from include/fastrtps/rtps/reader Signed-off-by: EduPonz --- include/fastrtps/rtps/reader/RTPSReader.h | 24 ------------------ .../rtps/reader/ReaderDiscoveryInfo.h | 25 ------------------- include/fastrtps/rtps/reader/ReaderListener.h | 25 ------------------- .../rtps/reader/StatefulPersistentReader.h | 25 ------------------- include/fastrtps/rtps/reader/StatefulReader.h | 24 ------------------ .../rtps/reader/StatelessPersistentReader.h | 25 ------------------- .../fastrtps/rtps/reader/StatelessReader.h | 25 ------------------- .../TypeLookupReplyListener.hpp | 3 ++- .../TypeLookupRequestListener.hpp | 3 ++- 9 files changed, 4 insertions(+), 175 deletions(-) delete mode 100644 include/fastrtps/rtps/reader/RTPSReader.h delete mode 100644 include/fastrtps/rtps/reader/ReaderDiscoveryInfo.h delete mode 100644 include/fastrtps/rtps/reader/ReaderListener.h delete mode 100644 include/fastrtps/rtps/reader/StatefulPersistentReader.h delete mode 100644 include/fastrtps/rtps/reader/StatefulReader.h delete mode 100644 include/fastrtps/rtps/reader/StatelessPersistentReader.h delete mode 100644 include/fastrtps/rtps/reader/StatelessReader.h diff --git a/include/fastrtps/rtps/reader/RTPSReader.h b/include/fastrtps/rtps/reader/RTPSReader.h deleted file mode 100644 index d1dd993dbed..00000000000 --- a/include/fastrtps/rtps/reader/RTPSReader.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file RTPSReader.h - */ - -#ifndef FASTRTPS_RTPS_READER_RTPSREADER_H_ -#define FASTRTPS_RTPS_READER_RTPSREADER_H_ - -#include - -#endif /* FASTRTPS_RTPS_READER_RTPSREADER_H_ */ diff --git a/include/fastrtps/rtps/reader/ReaderDiscoveryInfo.h b/include/fastrtps/rtps/reader/ReaderDiscoveryInfo.h deleted file mode 100644 index d040f38cd67..00000000000 --- a/include/fastrtps/rtps/reader/ReaderDiscoveryInfo.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2018 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file ReaderDiscoveryInfo.h - * - */ - -#ifndef __RTPS_READER_READERDISCOVERYINFO_H__ -#define __RTPS_READER_READERDISCOVERYINFO_H__ - -#include - -#endif // __RTPS_READER_READERDISCOVERYINFO_H__ diff --git a/include/fastrtps/rtps/reader/ReaderListener.h b/include/fastrtps/rtps/reader/ReaderListener.h deleted file mode 100644 index e837e599892..00000000000 --- a/include/fastrtps/rtps/reader/ReaderListener.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file ReaderListener.h - * - */ - -#ifndef READERLISTENER_H_ -#define READERLISTENER_H_ - -#include - -#endif /* READERLISTENER_H_ */ diff --git a/include/fastrtps/rtps/reader/StatefulPersistentReader.h b/include/fastrtps/rtps/reader/StatefulPersistentReader.h deleted file mode 100644 index 565b9607d2f..00000000000 --- a/include/fastrtps/rtps/reader/StatefulPersistentReader.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2018 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file StatefulPersistentReader.h - */ - - -#ifndef STATEFULPERSISTENTREADER_H_ -#define STATEFULPERSISTENTREADER_H_ - -#include - -#endif /* STATEFULPERSISTENTREADER_H_ */ diff --git a/include/fastrtps/rtps/reader/StatefulReader.h b/include/fastrtps/rtps/reader/StatefulReader.h deleted file mode 100644 index e7d5bcf6212..00000000000 --- a/include/fastrtps/rtps/reader/StatefulReader.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file StatefulReader.h - */ - -#ifndef _RTPS_READER_STATEFULREADER_H_ -#define _RTPS_READER_STATEFULREADER_H_ - -#include - -#endif //_RTPS_READER_STATEFULREADER_H_ diff --git a/include/fastrtps/rtps/reader/StatelessPersistentReader.h b/include/fastrtps/rtps/reader/StatelessPersistentReader.h deleted file mode 100644 index 8be6becb69b..00000000000 --- a/include/fastrtps/rtps/reader/StatelessPersistentReader.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2018 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file StatelessPersistentReader.h - */ - - -#ifndef STATELESSPERSISTENTREADER_H_ -#define STATELESSPERSISTENTREADER_H_ - -#include - -#endif /* STATELESSPERSISTENTREADER_H_ */ diff --git a/include/fastrtps/rtps/reader/StatelessReader.h b/include/fastrtps/rtps/reader/StatelessReader.h deleted file mode 100644 index 03aad9110ef..00000000000 --- a/include/fastrtps/rtps/reader/StatelessReader.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file StatelessReader.h - */ - - -#ifndef FASTRTPS_RTPS_READER_STATELESSREADER_H_ -#define FASTRTPS_RTPS_READER_STATELESSREADER_H_ - -#include - -#endif /* FASTRTPS_RTPS_READER_STATELESSREADER_H_ */ diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.hpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.hpp index aa2df3fbaf1..2cecff52d72 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.hpp @@ -26,11 +26,12 @@ #include #include -#include #include #include #include +#include + #include #include diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.hpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.hpp index 4ee685e60e9..e529b34339d 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.hpp @@ -26,11 +26,12 @@ #include #include -#include #include #include +#include #include + #include #include From 1b6beea46756c2cdd2e788cddebb68cbd3182de8 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 11 Mar 2024 14:59:31 +0100 Subject: [PATCH 14/20] Refs #20568: Remove all possible from include/fastrtps/rtps/resources Signed-off-by: EduPonz --- .../fastrtps/rtps/resources/ResourceEvent.h | 25 ------------------- .../rtps/resources/ResourceManagement.h | 25 ------------------- include/fastrtps/rtps/resources/TimedEvent.h | 25 ------------------- 3 files changed, 75 deletions(-) delete mode 100644 include/fastrtps/rtps/resources/ResourceEvent.h delete mode 100644 include/fastrtps/rtps/resources/ResourceManagement.h delete mode 100644 include/fastrtps/rtps/resources/TimedEvent.h diff --git a/include/fastrtps/rtps/resources/ResourceEvent.h b/include/fastrtps/rtps/resources/ResourceEvent.h deleted file mode 100644 index 70b2020edab..00000000000 --- a/include/fastrtps/rtps/resources/ResourceEvent.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file ResourceEvent.h - * - */ - -#ifndef _RTPS_RESOURCES_RESOURCEEVENT_H_ -#define _RTPS_RESOURCES_RESOURCEEVENT_H_ - -#include - -#endif //_RTPS_RESOURCES_RESOURCEEVENT_H_ diff --git a/include/fastrtps/rtps/resources/ResourceManagement.h b/include/fastrtps/rtps/resources/ResourceManagement.h deleted file mode 100644 index a6324ce5633..00000000000 --- a/include/fastrtps/rtps/resources/ResourceManagement.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file ResourceManagement.h - * - */ - -#ifndef RESOURCE_MANAGEMENT_H_ -#define RESOURCE_MANAGEMENT_H_ - -#include - -#endif /* RESOURCE_MANAGEMENT_H_ */ diff --git a/include/fastrtps/rtps/resources/TimedEvent.h b/include/fastrtps/rtps/resources/TimedEvent.h deleted file mode 100644 index f61eac2a567..00000000000 --- a/include/fastrtps/rtps/resources/TimedEvent.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file TimedEvent.h - * - */ - -#ifndef _RTPS_RESOURCES_TIMEDEVENT_H_ -#define _RTPS_RESOURCES_TIMEDEVENT_H_ - -#include - -#endif //_RTPS_RESOURCES_TIMEDEVENT_H_ From 0ebeca49965d772f473168505a1419204b5a14c8 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 11 Mar 2024 14:59:50 +0100 Subject: [PATCH 15/20] Refs #20568: Remove all possible from include/fastrtps/rtps/security Signed-off-by: EduPonz --- .../security/accesscontrol/AccessControl.h | 23 ------------------ .../EndpointSecurityAttributes.h | 23 ------------------ .../ParticipantSecurityAttributes.h | 23 ------------------ .../accesscontrol/SecurityMaskUtilities.h | 23 ------------------ .../security/authentication/Authentication.h | 23 ------------------ .../rtps/security/authentication/Handshake.h | 23 ------------------ .../fastrtps/rtps/security/common/Handle.h | 23 ------------------ .../common/ParticipantGenericMessage.h | 20 ---------------- .../rtps/security/common/SharedSecretHandle.h | 23 ------------------ .../security/cryptography/CryptoKeyExchange.h | 23 ------------------ .../security/cryptography/CryptoKeyFactory.h | 23 ------------------ .../security/cryptography/CryptoTransform.h | 23 ------------------ .../rtps/security/cryptography/CryptoTypes.h | 23 ------------------ .../rtps/security/cryptography/Cryptography.h | 24 ------------------- .../security/exceptions/SecurityException.h | 20 ---------------- 15 files changed, 340 deletions(-) delete mode 100644 include/fastrtps/rtps/security/accesscontrol/AccessControl.h delete mode 100644 include/fastrtps/rtps/security/accesscontrol/EndpointSecurityAttributes.h delete mode 100644 include/fastrtps/rtps/security/accesscontrol/ParticipantSecurityAttributes.h delete mode 100644 include/fastrtps/rtps/security/accesscontrol/SecurityMaskUtilities.h delete mode 100644 include/fastrtps/rtps/security/authentication/Authentication.h delete mode 100644 include/fastrtps/rtps/security/authentication/Handshake.h delete mode 100644 include/fastrtps/rtps/security/common/Handle.h delete mode 100644 include/fastrtps/rtps/security/common/ParticipantGenericMessage.h delete mode 100644 include/fastrtps/rtps/security/common/SharedSecretHandle.h delete mode 100644 include/fastrtps/rtps/security/cryptography/CryptoKeyExchange.h delete mode 100644 include/fastrtps/rtps/security/cryptography/CryptoKeyFactory.h delete mode 100644 include/fastrtps/rtps/security/cryptography/CryptoTransform.h delete mode 100644 include/fastrtps/rtps/security/cryptography/CryptoTypes.h delete mode 100644 include/fastrtps/rtps/security/cryptography/Cryptography.h delete mode 100644 include/fastrtps/rtps/security/exceptions/SecurityException.h diff --git a/include/fastrtps/rtps/security/accesscontrol/AccessControl.h b/include/fastrtps/rtps/security/accesscontrol/AccessControl.h deleted file mode 100644 index 3e0e014d51c..00000000000 --- a/include/fastrtps/rtps/security/accesscontrol/AccessControl.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2018 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/*! - * @file AccessControl.h - */ -#ifndef __RTPS_SECURITY_ACCESSCONTROL_ACCESSCONTROL_H__ -#define __RTPS_SECURITY_ACCESSCONTROL_ACCESSCONTROL_H__ - -#include - -#endif // __RTPS_SECURITY_ACCESSCONTROL_ACCESSCONTROL_H__ diff --git a/include/fastrtps/rtps/security/accesscontrol/EndpointSecurityAttributes.h b/include/fastrtps/rtps/security/accesscontrol/EndpointSecurityAttributes.h deleted file mode 100644 index addd35a4e0d..00000000000 --- a/include/fastrtps/rtps/security/accesscontrol/EndpointSecurityAttributes.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2018 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/*! - * @file EndpointSecurityAttributes.h - */ -#ifndef __RTPS_SECURITY_ACCESSCONTROL_ENDPOINTSECURITYATTRIBUTES_H__ -#define __RTPS_SECURITY_ACCESSCONTROL_ENDPOINTSECURITYATTRIBUTES_H__ - -#include - -#endif // __RTPS_SECURITY_ACCESSCONTROL_ENDPOINTSECURITYATTRIBUTES_H__ diff --git a/include/fastrtps/rtps/security/accesscontrol/ParticipantSecurityAttributes.h b/include/fastrtps/rtps/security/accesscontrol/ParticipantSecurityAttributes.h deleted file mode 100644 index 0bb365e03ad..00000000000 --- a/include/fastrtps/rtps/security/accesscontrol/ParticipantSecurityAttributes.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2018 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/*! - * @file ParticipantSecurityAttributes.h - */ -#ifndef __RTPS_SECURITY_ACCESSCONTROL_PARTICIPANTSECURITYATTRIBUTES_H__ -#define __RTPS_SECURITY_ACCESSCONTROL_PARTICIPANTSECURITYATTRIBUTES_H__ - -#include - -#endif // __RTPS_SECURITY_ACCESSCONTROL_PARTICIPANTSECURITYATTRIBUTES_H__ diff --git a/include/fastrtps/rtps/security/accesscontrol/SecurityMaskUtilities.h b/include/fastrtps/rtps/security/accesscontrol/SecurityMaskUtilities.h deleted file mode 100644 index d173bbce131..00000000000 --- a/include/fastrtps/rtps/security/accesscontrol/SecurityMaskUtilities.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2018 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/*! - * @file SecurityMaskUtilities.h - */ -#ifndef __RTPS_SECURITY_ACCESSCONTROL_SECURITYMASKUTILITIES_H__ -#define __RTPS_SECURITY_ACCESSCONTROL_SECURITYMASKUTILITIES_H__ - -#include - -#endif // __RTPS_SECURITY_ACCESSCONTROL_SECURITYMASKUTILITIES_H__ diff --git a/include/fastrtps/rtps/security/authentication/Authentication.h b/include/fastrtps/rtps/security/authentication/Authentication.h deleted file mode 100644 index 0f0d87b0f64..00000000000 --- a/include/fastrtps/rtps/security/authentication/Authentication.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/*! - * @file Authentication.h - */ -#ifndef _RTPS_SECURITY_AUTHENTICATION_AUTHENTICATION_H_ -#define _RTPS_SECURITY_AUTHENTICATION_AUTHENTICATION_H_ - -#include - -#endif // _RTPS_SECURITY_AUTHENTICATION_AUTHENTICATION_H_ diff --git a/include/fastrtps/rtps/security/authentication/Handshake.h b/include/fastrtps/rtps/security/authentication/Handshake.h deleted file mode 100644 index 250447067c4..00000000000 --- a/include/fastrtps/rtps/security/authentication/Handshake.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/*! - * @file Handshake.h - */ -#ifndef _RTPS_SECURITY_AUTHENTICATION_HANDSHAKE_H_ -#define _RTPS_SECURITY_AUTHENTICATION_HANDSHAKE_H_ - -#include - -#endif // _RTPS_SECURITY_AUTHENTICATION_HANDSHAKE_H_ diff --git a/include/fastrtps/rtps/security/common/Handle.h b/include/fastrtps/rtps/security/common/Handle.h deleted file mode 100644 index 9d5652d93ac..00000000000 --- a/include/fastrtps/rtps/security/common/Handle.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/*! - * @file Handle.h - */ -#ifndef _RTPS_SECURITY_COMMON_HANDLE_H_ -#define _RTPS_SECURITY_COMMON_HANDLE_H_ - -#include - -#endif // _RTPS_SECURITY_COMMON_HANDLE_H_ diff --git a/include/fastrtps/rtps/security/common/ParticipantGenericMessage.h b/include/fastrtps/rtps/security/common/ParticipantGenericMessage.h deleted file mode 100644 index 78ed09716aa..00000000000 --- a/include/fastrtps/rtps/security/common/ParticipantGenericMessage.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef _RTPS_SECURITY_COMMON_PARTICIPANTGENERICMESSAGE_H_ -#define _RTPS_SECURITY_COMMON_PARTICIPANTGENERICMESSAGE_H_ - -#include - -#endif // _RTPS_SECURITY_COMMON_PARTICIPANTGENERICMESSAGE_H_ diff --git a/include/fastrtps/rtps/security/common/SharedSecretHandle.h b/include/fastrtps/rtps/security/common/SharedSecretHandle.h deleted file mode 100644 index d7c309edce7..00000000000 --- a/include/fastrtps/rtps/security/common/SharedSecretHandle.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/*! - * @file SharedSecretHandle.h - */ -#ifndef _RTPS_SECURITY_COMMON_SHAREDSECRETHANDLE_H_ -#define _RTPS_SECURITY_COMMON_SHAREDSECRETHANDLE_H_ - -#include - -#endif // _RTPS_SECURITY_COMMON_SHAREDSECRETHANDLE_H_ diff --git a/include/fastrtps/rtps/security/cryptography/CryptoKeyExchange.h b/include/fastrtps/rtps/security/cryptography/CryptoKeyExchange.h deleted file mode 100644 index fec02399748..00000000000 --- a/include/fastrtps/rtps/security/cryptography/CryptoKeyExchange.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/*! - * @file Authentication.h - */ -#ifndef _RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOKEYEXCHANGE_H_ -#define _RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOKEYEXCHANGE_H_ - -#include - -#endif //_RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOKEYEXCHANGE_H_ diff --git a/include/fastrtps/rtps/security/cryptography/CryptoKeyFactory.h b/include/fastrtps/rtps/security/cryptography/CryptoKeyFactory.h deleted file mode 100644 index 519eac2009d..00000000000 --- a/include/fastrtps/rtps/security/cryptography/CryptoKeyFactory.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/*! - * @file CryptoKeyFactory.h - */ -#ifndef _RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOKEYFACTORY_H_ -#define _RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOKEYFACTORY_H_ - -#include - -#endif //_RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOKEYFACTORY_H_ diff --git a/include/fastrtps/rtps/security/cryptography/CryptoTransform.h b/include/fastrtps/rtps/security/cryptography/CryptoTransform.h deleted file mode 100644 index 8660f7997de..00000000000 --- a/include/fastrtps/rtps/security/cryptography/CryptoTransform.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/*! - * @file Authentication.h - */ -#ifndef _RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOTRANSFORM_H_ -#define _RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOTRANSFORM_H_ - -#include - -#endif //_RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOTRANSFORM_H_ diff --git a/include/fastrtps/rtps/security/cryptography/CryptoTypes.h b/include/fastrtps/rtps/security/cryptography/CryptoTypes.h deleted file mode 100644 index 20e41382f17..00000000000 --- a/include/fastrtps/rtps/security/cryptography/CryptoTypes.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/*! - * @file Authentication.h - */ -#ifndef _RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOTYPES_H_ -#define _RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOTYPES_H_ - -#include - -#endif //_RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOTYPES_H_ diff --git a/include/fastrtps/rtps/security/cryptography/Cryptography.h b/include/fastrtps/rtps/security/cryptography/Cryptography.h deleted file mode 100644 index 773a8782919..00000000000 --- a/include/fastrtps/rtps/security/cryptography/Cryptography.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/*! - * @file Cryptography.h - */ - -#ifndef _RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOGRAPHY_H_ -#define _RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOGRAPHY_H_ - -#include - -#endif //_RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOGRAPHY_H_ diff --git a/include/fastrtps/rtps/security/exceptions/SecurityException.h b/include/fastrtps/rtps/security/exceptions/SecurityException.h deleted file mode 100644 index 9ae54f07df5..00000000000 --- a/include/fastrtps/rtps/security/exceptions/SecurityException.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef _RTPS_SECURITY_EXCEPTIONS_SECURITYEXCEPTION_H_ -#define _RTPS_SECURITY_EXCEPTIONS_SECURITYEXCEPTION_H_ - -#include - -#endif // _RTPS_SECURITY_EXCEPTIONS_SECURITYEXCEPTION_H_ From 79b14d99e7e127b37deda188bfb3e39d789964a7 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 11 Mar 2024 15:01:42 +0100 Subject: [PATCH 16/20] Refs #20568: Remove all possible from include/fastrtps/rtps/writer Signed-off-by: EduPonz --- .../fastrtps/rtps/writer/PersistentWriter.h | 25 ------------------ include/fastrtps/rtps/writer/RTPSWriter.h | 24 ----------------- include/fastrtps/rtps/writer/ReaderLocator.h | 26 ------------------- include/fastrtps/rtps/writer/ReaderProxy.h | 23 ---------------- .../rtps/writer/StatefulPersistentWriter.h | 25 ------------------ include/fastrtps/rtps/writer/StatefulWriter.h | 25 ------------------ .../rtps/writer/StatelessPersistentWriter.h | 25 ------------------ .../fastrtps/rtps/writer/StatelessWriter.h | 25 ------------------ .../rtps/writer/WriterDiscoveryInfo.h | 25 ------------------ include/fastrtps/rtps/writer/WriterListener.h | 25 ------------------ .../TypeLookupReplyListener.hpp | 3 +-- .../TypeLookupRequestListener.hpp | 3 +-- 12 files changed, 2 insertions(+), 252 deletions(-) delete mode 100644 include/fastrtps/rtps/writer/PersistentWriter.h delete mode 100644 include/fastrtps/rtps/writer/RTPSWriter.h delete mode 100644 include/fastrtps/rtps/writer/ReaderLocator.h delete mode 100644 include/fastrtps/rtps/writer/ReaderProxy.h delete mode 100644 include/fastrtps/rtps/writer/StatefulPersistentWriter.h delete mode 100644 include/fastrtps/rtps/writer/StatefulWriter.h delete mode 100644 include/fastrtps/rtps/writer/StatelessPersistentWriter.h delete mode 100644 include/fastrtps/rtps/writer/StatelessWriter.h delete mode 100644 include/fastrtps/rtps/writer/WriterDiscoveryInfo.h delete mode 100644 include/fastrtps/rtps/writer/WriterListener.h diff --git a/include/fastrtps/rtps/writer/PersistentWriter.h b/include/fastrtps/rtps/writer/PersistentWriter.h deleted file mode 100644 index ec276701363..00000000000 --- a/include/fastrtps/rtps/writer/PersistentWriter.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2018 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file PersistentWriter.h - */ - - -#ifndef PERSISTENTWRITER_H_ -#define PERSISTENTWRITER_H_ - -#include - -#endif /* PERSISTENTWRITER_H_ */ diff --git a/include/fastrtps/rtps/writer/RTPSWriter.h b/include/fastrtps/rtps/writer/RTPSWriter.h deleted file mode 100644 index 6c926ffcec3..00000000000 --- a/include/fastrtps/rtps/writer/RTPSWriter.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file RTPSWriter.h - */ - -#ifndef RTPSWRITER_H_ -#define RTPSWRITER_H_ - -#include - -#endif /* RTPSWRITER_H_ */ diff --git a/include/fastrtps/rtps/writer/ReaderLocator.h b/include/fastrtps/rtps/writer/ReaderLocator.h deleted file mode 100644 index 7745d1f2a80..00000000000 --- a/include/fastrtps/rtps/writer/ReaderLocator.h +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file ReaderLocator.h - */ - - - -#ifndef READERLOCATOR_H_ -#define READERLOCATOR_H_ - -#include - -#endif /* READERLOCATOR_H_ */ diff --git a/include/fastrtps/rtps/writer/ReaderProxy.h b/include/fastrtps/rtps/writer/ReaderProxy.h deleted file mode 100644 index e0fde9bd32b..00000000000 --- a/include/fastrtps/rtps/writer/ReaderProxy.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016-2019 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file ReaderProxy.h - */ -#ifndef FASTRTPS_RTPS_WRITER_READERPROXY_H_ -#define FASTRTPS_RTPS_WRITER_READERPROXY_H_ - -#include - -#endif /* FASTRTPS_RTPS_WRITER_READERPROXY_H_ */ diff --git a/include/fastrtps/rtps/writer/StatefulPersistentWriter.h b/include/fastrtps/rtps/writer/StatefulPersistentWriter.h deleted file mode 100644 index 04ae427c907..00000000000 --- a/include/fastrtps/rtps/writer/StatefulPersistentWriter.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2018 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file StatefulPersistentWriter.h - */ - - -#ifndef STATEFULPERSISTENTWRITER_H_ -#define STATEFULPERSISTENTWRITER_H_ - -#include - -#endif /* STATEFULPERSISTENTWRITER_H_ */ diff --git a/include/fastrtps/rtps/writer/StatefulWriter.h b/include/fastrtps/rtps/writer/StatefulWriter.h deleted file mode 100644 index fa9125699b9..00000000000 --- a/include/fastrtps/rtps/writer/StatefulWriter.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file StatefulWriter.h - * - */ - -#ifndef STATEFULWRITER_H_ -#define STATEFULWRITER_H_ - -#include - -#endif /* STATEFULWRITER_H_ */ diff --git a/include/fastrtps/rtps/writer/StatelessPersistentWriter.h b/include/fastrtps/rtps/writer/StatelessPersistentWriter.h deleted file mode 100644 index 5867b7caa40..00000000000 --- a/include/fastrtps/rtps/writer/StatelessPersistentWriter.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2018 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file StatelessPersistentWriter.h - */ - - -#ifndef STATELESSPERSISTENTWRITER_H_ -#define STATELESSPERSISTENTWRITER_H_ - -#include - -#endif /* STATELESSPERSISTENTWRITER_H_ */ diff --git a/include/fastrtps/rtps/writer/StatelessWriter.h b/include/fastrtps/rtps/writer/StatelessWriter.h deleted file mode 100644 index 0d7550a0937..00000000000 --- a/include/fastrtps/rtps/writer/StatelessWriter.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file StatelessWriter.h - */ - - -#ifndef STATELESSWRITER_H_ -#define STATELESSWRITER_H_ - -#include - -#endif /* STATELESSWRITER_H_ */ diff --git a/include/fastrtps/rtps/writer/WriterDiscoveryInfo.h b/include/fastrtps/rtps/writer/WriterDiscoveryInfo.h deleted file mode 100644 index fd07f3825db..00000000000 --- a/include/fastrtps/rtps/writer/WriterDiscoveryInfo.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2018 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file WriterDiscoveryInfo.h - * - */ - -#ifndef __RTPS_WRITER_WRITERDISCOVERYINFO_H__ -#define __RTPS_WRITER_WRITERDISCOVERYINFO_H__ - -#include - -#endif // __RTPS_WRITER_WRITERDISCOVERYINFO_H__ diff --git a/include/fastrtps/rtps/writer/WriterListener.h b/include/fastrtps/rtps/writer/WriterListener.h deleted file mode 100644 index f4e8b3d2df9..00000000000 --- a/include/fastrtps/rtps/writer/WriterListener.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file WriterListener.h - * - */ - -#ifndef WRITERLISTENER_H_ -#define WRITERLISTENER_H_ - -#include - -#endif /* WRITERLISTENER_H_ */ diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.hpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.hpp index 2cecff52d72..316eb675c83 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.hpp @@ -26,11 +26,10 @@ #include #include -#include - #include #include #include +#include #include #include diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.hpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.hpp index e529b34339d..4529b5e246e 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.hpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.hpp @@ -26,10 +26,9 @@ #include #include -#include - #include #include +#include #include #include From f267372b4b743abb9a81641ba612f383a42c0ccc Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 11 Mar 2024 15:04:45 +0100 Subject: [PATCH 17/20] Refs #20568: Remove all possible from include/fastrtps/rtps Signed-off-by: EduPonz --- include/fastrtps/rtps/Endpoint.h | 24 ------------------ include/fastrtps/rtps/RTPSDomain.h | 24 ------------------ include/fastrtps/rtps/rtps_fwd.h | 25 ------------------- test/blackbox/common/RTPSAsSocketReader.hpp | 7 ++++-- test/blackbox/common/RTPSAsSocketWriter.hpp | 9 ++++--- .../common/RTPSWithRegistrationReader.hpp | 7 ++++-- 6 files changed, 16 insertions(+), 80 deletions(-) delete mode 100644 include/fastrtps/rtps/Endpoint.h delete mode 100644 include/fastrtps/rtps/RTPSDomain.h delete mode 100644 include/fastrtps/rtps/rtps_fwd.h diff --git a/include/fastrtps/rtps/Endpoint.h b/include/fastrtps/rtps/Endpoint.h deleted file mode 100644 index c42fdc12055..00000000000 --- a/include/fastrtps/rtps/Endpoint.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file Endpoint.h - */ - -#ifndef _RTPS_ENDPOINT_H_ -#define _RTPS_ENDPOINT_H_ - -#include - -#endif //_RTPS_ENDPOINT_H_ diff --git a/include/fastrtps/rtps/RTPSDomain.h b/include/fastrtps/rtps/RTPSDomain.h deleted file mode 100644 index aa6bb7dd350..00000000000 --- a/include/fastrtps/rtps/RTPSDomain.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file RTPSDomain.h - */ - -#ifndef RTPSRTPSParticipant_H_ -#define RTPSRTPSParticipant_H_ - -#include - -#endif /* RTPSRTPSParticipant_H_ */ diff --git a/include/fastrtps/rtps/rtps_fwd.h b/include/fastrtps/rtps/rtps_fwd.h deleted file mode 100644 index f82b039c835..00000000000 --- a/include/fastrtps/rtps/rtps_fwd.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file rtps_fwd.h - * - */ - -#ifndef RTPS_FWD_H_ -#define RTPS_FWD_H_ - -#include - -#endif /* RTPS_FWD_H_ */ diff --git a/test/blackbox/common/RTPSAsSocketReader.hpp b/test/blackbox/common/RTPSAsSocketReader.hpp index f50a89b0a44..8c3fc203798 100644 --- a/test/blackbox/common/RTPSAsSocketReader.hpp +++ b/test/blackbox/common/RTPSAsSocketReader.hpp @@ -32,8 +32,12 @@ #endif // if defined(_WIN32) #include + +#include + #include #include + #include #include #include @@ -44,10 +48,9 @@ #include #include #include + #include #include -#include -#include using eprosima::fastrtps::rtps::IPLocator; diff --git a/test/blackbox/common/RTPSAsSocketWriter.hpp b/test/blackbox/common/RTPSAsSocketWriter.hpp index f19a284256d..b36b230c841 100644 --- a/test/blackbox/common/RTPSAsSocketWriter.hpp +++ b/test/blackbox/common/RTPSAsSocketWriter.hpp @@ -20,13 +20,16 @@ #ifndef _TEST_BLACKBOX_RTPSASSOCKETWRITER_HPP_ #define _TEST_BLACKBOX_RTPSASSOCKETWRITER_HPP_ -#include -#include #include #include +#include + +#include + #include #include + #include #include #include @@ -36,8 +39,8 @@ #include #include #include + #include -#include using eprosima::fastrtps::rtps::IPLocator; diff --git a/test/blackbox/common/RTPSWithRegistrationReader.hpp b/test/blackbox/common/RTPSWithRegistrationReader.hpp index a62fb3af558..5cf90fb5bae 100644 --- a/test/blackbox/common/RTPSWithRegistrationReader.hpp +++ b/test/blackbox/common/RTPSWithRegistrationReader.hpp @@ -24,8 +24,12 @@ #include #include + +#include + #include #include + #include #include #include @@ -36,11 +40,10 @@ #include #include #include + #include #include #include -#include -#include using eprosima::fastrtps::rtps::IPLocator; From 91aaf08275ba7804b42e75b951ff20e19d3dbd61 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 11 Mar 2024 15:07:54 +0100 Subject: [PATCH 18/20] Refs #20568: Make UnitsParser private Signed-off-by: EduPonz --- src/cpp/rtps/participant/RTPSParticipantImpl.cpp | 2 +- src/cpp/utils/UnitsParser.cpp | 2 +- {include/fastrtps => src/cpp}/utils/UnitsParser.hpp | 0 src/cpp/xmlparser/XMLElementParser.cpp | 2 +- versions.md | 1 + 5 files changed, 4 insertions(+), 3 deletions(-) rename {include/fastrtps => src/cpp}/utils/UnitsParser.hpp (100%) diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp index fcfbaa8b314..827f8011606 100644 --- a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp +++ b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp @@ -50,7 +50,6 @@ #include #include #include -#include #include #include @@ -69,6 +68,7 @@ #include #include #include +#include #include #ifdef FASTDDS_STATISTICS #include diff --git a/src/cpp/utils/UnitsParser.cpp b/src/cpp/utils/UnitsParser.cpp index ec399ce56a7..886a2dadbe2 100644 --- a/src/cpp/utils/UnitsParser.cpp +++ b/src/cpp/utils/UnitsParser.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include namespace eprosima { namespace fastdds { diff --git a/include/fastrtps/utils/UnitsParser.hpp b/src/cpp/utils/UnitsParser.hpp similarity index 100% rename from include/fastrtps/utils/UnitsParser.hpp rename to src/cpp/utils/UnitsParser.hpp diff --git a/src/cpp/xmlparser/XMLElementParser.cpp b/src/cpp/xmlparser/XMLElementParser.cpp index 3ff68e71eda..53dc83c67ba 100644 --- a/src/cpp/xmlparser/XMLElementParser.cpp +++ b/src/cpp/xmlparser/XMLElementParser.cpp @@ -27,10 +27,10 @@ #include #include -#include #include #include +#include #include #include #include diff --git a/versions.md b/versions.md index dd41d9af90c..907b0456022 100644 --- a/versions.md +++ b/versions.md @@ -24,6 +24,7 @@ Forthcoming * TimeConversion * TypeLookupService * DBQueue + * UnitsParser * Added create participant methods that use environment XML profile for participant configuration. * New TypeObjectRegistry class to register/query TypeObjects/TypeIdentifiers. * New TypeObjectUtils class providing API to build and register TypeObjects/TypeIdentifiers. From 215844e6c045800844dd92eff03acafbb5684023 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 11 Mar 2024 15:10:09 +0100 Subject: [PATCH 19/20] Refs #20568: Remove all possible from include/fastrtps Signed-off-by: EduPonz --- include/fastrtps/TopicDataType.h | 33 ----------------- include/fastrtps/fastrtps_fwd.h | 35 ------------------- .../throughput/ThroughputPublisher.hpp | 1 + 3 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 include/fastrtps/TopicDataType.h delete mode 100644 include/fastrtps/fastrtps_fwd.h diff --git a/include/fastrtps/TopicDataType.h b/include/fastrtps/TopicDataType.h deleted file mode 100644 index 3129d74c0f5..00000000000 --- a/include/fastrtps/TopicDataType.h +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file TopicDataType.h - */ - -#ifndef TOPICDATATYPE_H_ -#define TOPICDATATYPE_H_ - -#include - -namespace eprosima { -namespace fastrtps { - -// Adding an alias to fastrtps namespace for legacy usage. -using TopicDataType = fastdds::dds::TopicDataType; - -} /* namespace fastrtps */ -} /* namespace eprosima */ - -#endif /* TOPICDATATYPE_H_ */ diff --git a/include/fastrtps/fastrtps_fwd.h b/include/fastrtps/fastrtps_fwd.h deleted file mode 100644 index 52f71e77b20..00000000000 --- a/include/fastrtps/fastrtps_fwd.h +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @file fastrtps_fwd.h - * - */ - -#ifndef FASTRTPS_FWD_H_ -#define FASTRTPS_FWD_H_ - -namespace eprosima -{ -namespace fastrtps -{ - class Participant; - class Publisher; - class Subscriber; -} -} - - - -#endif /* FASTRTPS_FWD_H_ */ diff --git a/test/performance/throughput/ThroughputPublisher.hpp b/test/performance/throughput/ThroughputPublisher.hpp index 8505369a865..0640aec8253 100644 --- a/test/performance/throughput/ThroughputPublisher.hpp +++ b/test/performance/throughput/ThroughputPublisher.hpp @@ -27,6 +27,7 @@ #include #include + #include #include #include From e4721aa8790072f98d654563c3e3d31fef2c6422 Mon Sep 17 00:00:00 2001 From: EduPonz Date: Mon, 25 Mar 2024 15:46:40 +0100 Subject: [PATCH 20/20] Refs #20568: Apply Eliana's suggestions Signed-off-by: EduPonz --- src/cpp/utils/UnitsParser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cpp/utils/UnitsParser.cpp b/src/cpp/utils/UnitsParser.cpp index 886a2dadbe2..191e166395b 100644 --- a/src/cpp/utils/UnitsParser.cpp +++ b/src/cpp/utils/UnitsParser.cpp @@ -17,16 +17,16 @@ * */ +#include + #include #include #include #include -#include #include +#include #include -#include - namespace eprosima { namespace fastdds { namespace dds {