Fix pro examples (#1161)

richiware · web-flow · commit aad3ae5ae466 · 2025-11-05T12:07:32.000+01:00
Signed-off-by: Ricardo González &lt;ricardo@richiware.dev&gt;
diff --git a/code/Examples/C++/RpcClientServerFeed/src/types/calculator.hpp b/code/Examples/C++/RpcClientServerFeed/src/types/calculator.hpp
@@ -16,7 +16,7 @@
  * @file calculator.hpp
  * This header file contains the declaration of the described types in the IDL file.
  *
- * This file was generated by the tool fastddsgen (version: 4.2.0 pro).
+ * This file was generated by the tool fastddsgen (version: 4.2.0 Pro).
  */
 
 #ifndef FAST_DDS_GENERATED__CALCULATOR_HPP
diff --git a/code/Examples/C++/RpcClientServerFeed/src/types/calculatorCdrAux.hpp b/code/Examples/C++/RpcClientServerFeed/src/types/calculatorCdrAux.hpp
@@ -16,7 +16,7 @@
  * @file calculatorCdrAux.hpp
  * This source file contains some definitions of CDR related functions.
  *
- * This file was generated by the tool fastddsgen (version: 4.2.0 pro).
+ * This file was generated by the tool fastddsgen (version: 4.2.0 Pro).
  */
 
 #ifndef FAST_DDS_GENERATED__CALCULATORCDRAUX_HPP
diff --git a/code/Examples/C++/RpcClientServerFeed/src/types/calculatorCdrAux.ipp b/code/Examples/C++/RpcClientServerFeed/src/types/calculatorCdrAux.ipp
@@ -16,7 +16,7 @@
  * @file calculatorCdrAux.ipp
  * This source file contains some declarations of CDR related functions.
  *
- * This file was generated by the tool fastddsgen (version: 4.2.0 pro).
+ * This file was generated by the tool fastddsgen (version: 4.2.0 Pro).
  */
 
 #ifndef FAST_DDS_GENERATED__CALCULATORCDRAUX_IPP
diff --git a/code/Examples/C++/RpcClientServerFeed/src/types/calculatorClient.cxx b/code/Examples/C++/RpcClientServerFeed/src/types/calculatorClient.cxx
@@ -16,7 +16,7 @@
  * @file calculatorClient.cxx
  * Client implementation for interfaces
  *
- * This file was generated by the tool fastddsgen (version: 4.2.0 pro).
+ * This file was generated by the tool fastddsgen (version: 4.2.0 Pro).
  */
 
 #include "calculatorClient.hpp"
diff --git a/code/Examples/C++/RpcClientServerFeed/src/types/calculatorClient.hpp b/code/Examples/C++/RpcClientServerFeed/src/types/calculatorClient.hpp
@@ -16,7 +16,7 @@
  * @file calculatorClient.hpp
  * Client implementation for interfaces
  *
- * This file was generated by the tool fastddsgen (version: 4.2.0 pro).
+ * This file was generated by the tool fastddsgen (version: 4.2.0 Pro).
  */
 
 #ifndef FAST_DDS_GENERATED__CALCULATOR_CLIENT_HPP
diff --git a/code/Examples/C++/RpcClientServerFeed/src/types/calculatorPubSubTypes.cxx b/code/Examples/C++/RpcClientServerFeed/src/types/calculatorPubSubTypes.cxx
@@ -16,7 +16,7 @@
  * @file calculatorPubSubTypes.cpp
  * This header file contains the implementation of the serialization functions.
  *
- * This file was generated by the tool fastddsgen (version: 4.2.0 pro).
+ * This file was generated by the tool fastddsgen (version: 4.2.0 Pro).
  */
 
 #include "calculatorPubSubTypes.hpp"
diff --git a/code/Examples/C++/RpcClientServerFeed/src/types/calculatorPubSubTypes.hpp b/code/Examples/C++/RpcClientServerFeed/src/types/calculatorPubSubTypes.hpp
@@ -16,7 +16,7 @@
  * @file calculatorPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
- * This file was generated by the tool fastddsgen (version: 4.2.0 pro).
+ * This file was generated by the tool fastddsgen (version: 4.2.0 Pro).
  */
 
 
diff --git a/code/Examples/C++/RpcClientServerFeed/src/types/calculatorServer.cxx b/code/Examples/C++/RpcClientServerFeed/src/types/calculatorServer.cxx
@@ -16,7 +16,7 @@
  * @file calculatorServer.cxx
  * Server implementation for interfaces
  *
- * This file was generated by the tool fastddsgen (version: 4.2.0 pro).
+ * This file was generated by the tool fastddsgen (version: 4.2.0 Pro).
  */
 
 #include "calculatorServer.hpp"
diff --git a/code/Examples/C++/RpcClientServerFeed/src/types/calculatorServer.hpp b/code/Examples/C++/RpcClientServerFeed/src/types/calculatorServer.hpp
@@ -16,7 +16,7 @@
  * @file calculatorServer.hpp
  * Server implementation for interfaces
  *
- * This file was generated by the tool fastddsgen (version: 4.2.0 pro).
+ * This file was generated by the tool fastddsgen (version: 4.2.0 Pro).
  */
 
 #ifndef FAST_DDS_GENERATED__CALCULATOR_SERVER_HPP
@@ -28,6 +28,8 @@
 #include <fastdds/dds/domain/qos/ReplierQos.hpp>
 #include <fastdds/dds/rpc/exceptions.hpp>
 #include <fastdds/dds/rpc/interfaces.hpp>
+#include <fastdds/dds/rpc/interfaces/RpcServerReader.hpp>
+#include <fastdds/dds/rpc/interfaces/RpcServerWriter.hpp>
 #include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/rtps/common/RemoteLocators.hpp>
 
diff --git a/code/Examples/C++/RpcClientServerFeed/src/types/calculatorServerImpl.hpp b/code/Examples/C++/RpcClientServerFeed/src/types/calculatorServerImpl.hpp
@@ -16,7 +16,7 @@
  * @file calculatorServerImpl.hpp
  * Server implementation for interfaces
  *
- * This file was generated by the tool fastddsgen (version: 4.2.0 pro).
+ * This file was generated by the tool fastddsgen (version: 4.2.0 Pro).
  */
 
 #ifndef FAST_DDS_GENERATED__CALCULATOR_SERVERIMPL_HPP
diff --git a/code/Examples/C++/RpcClientServerFeed/src/types/calculatorTypeObjectSupport.cxx b/code/Examples/C++/RpcClientServerFeed/src/types/calculatorTypeObjectSupport.cxx
@@ -16,7 +16,7 @@
  * @file calculatorTypeObjectSupport.cxx
  * Source file containing the implementation to register the TypeObject representation of the described types in the IDL file
  *
- * This file was generated by the tool fastddsgen (version: 4.2.0 pro).
+ * This file was generated by the tool fastddsgen (version: 4.2.0 Pro).
  */
 
 #include "calculatorTypeObjectSupport.hpp"
diff --git a/code/Examples/C++/RpcClientServerFeed/src/types/calculatorTypeObjectSupport.hpp b/code/Examples/C++/RpcClientServerFeed/src/types/calculatorTypeObjectSupport.hpp
@@ -16,7 +16,7 @@
  * @file calculatorTypeObjectSupport.hpp
  * Header file containing the API required to register the TypeObject representation of the described types in the IDL file
  *
- * This file was generated by the tool fastddsgen (version: 4.2.0 pro).
+ * This file was generated by the tool fastddsgen (version: 4.2.0 Pro).
  */
 
 #ifndef FAST_DDS_GENERATED__CALCULATOR_TYPE_OBJECT_SUPPORT_HPP
diff --git a/code/Examples/C++/RpcClientServerFeed/src/types/calculator_details.hpp b/code/Examples/C++/RpcClientServerFeed/src/types/calculator_details.hpp
@@ -16,7 +16,7 @@
  * @file calculator_details.hpp
  * This header file contains support data structures for RPC communication.
  *
- * This file was generated by the tool fastddsgen (version: 4.2.0 pro).
+ * This file was generated by the tool fastddsgen (version: 4.2.0 Pro).
  */
 
 #ifndef FAST_DDS_GENERATED__CALCULATOR_DETAILS_HPP
diff --git a/code/ProDDSCodeTester.cpp b/code/ProDDSCodeTester.cpp
@@ -9,13 +9,15 @@
 
 using namespace eprosima::fastdds::dds;
 
-void dds_transport_examples ()
+void dds_transport_pro_examples ()
 {
     using TSN_UDPv4TransportDescriptor = eprosima::fastdds::rtps::TSN_UDPv4TransportDescriptor;
     using EthernetTransportDescriptor = eprosima::fastdds::rtps::EthernetTransportDescriptor;
     using UDPPriorityMapping = eprosima::fastdds::rtps::UDPPriorityMapping;
+    using UDPv4TransportDescriptor = eprosima::fastdds::rtps::UDPv4TransportDescriptor;
     using PayloadCompressionTransportDescriptor = eprosima::fastdds::rtps::PayloadCompressionTransportDescriptor;
     using HeaderReductionTransportDescriptor = eprosima::fastdds::rtps::HeaderReductionTransportDescriptor;
+    using Property = eprosima::fastdds::rtps::Property;
 
     {
         //TSN_SET_UDP_TUPLE
@@ -28,27 +30,27 @@ void dds_transport_examples ()
         UDPPriorityMapping udp_priority_mapping_1;
         int32_t udp_priority_1 = -1;
         udp_priority_mapping_1.source_port = 5000;
-        udp_transport->udp_priority_mappings[udp_priority_1] = udp_priority_mapping_1;
+        udp_transport->priority_mapping[udp_priority_1] = udp_priority_mapping_1;
 
         UDPPriorityMapping udp_priority_mapping_2;
         int32_t udp_priority_2 = 1;
         udp_priority_mapping_2.source_port = 5000;
         udp_priority_mapping_2.dscp = 1;
-        udp_transport->udp_priority_mappings[udp_priority_2] = udp_priority_mapping_2;
+        udp_transport->priority_mapping[udp_priority_2] = udp_priority_mapping_2;
 
         UDPPriorityMapping udp_priority_mapping_3;
         int32_t udp_priority_3 = 2;
         udp_priority_mapping_3.source_port = 5000;
         udp_priority_mapping_3.dscp = 2;
         udp_priority_mapping_3.interface = "eth0";
-        udp_transport->udp_priority_mappings[udp_priority_3] = udp_priority_mapping_3;
+        udp_transport->priority_mapping[udp_priority_3] = udp_priority_mapping_3;
 
         UDPPriorityMapping udp_priority_mapping_4;
         int32_t udp_priority_4 = 3;
         udp_priority_mapping_4.source_port = 5000;
         udp_priority_mapping_4.dscp = 3;
         udp_priority_mapping_4.interface = "10.10.1.2";
-        udp_transport->udp_priority_mappings[udp_priority_4] = udp_priority_mapping_4;
+        udp_transport->priority_mapping[udp_priority_4] = udp_priority_mapping_4;
 
         // Link the Transport Layer to the Participant.
         qos.transport().user_transports.push_back(udp_transport);
@@ -75,20 +77,20 @@ void dds_transport_examples ()
         EthernetTransportDescriptor::PriorityMapping ethernet_priority_mapping_1;
         int32_t ethernet_priority_1 = -1;
         ethernet_priority_mapping_1.source_port = 5000;
-        ethernet_transport->ethernet_priority_mappings[ethernet_priority_1] = ethernet_priority_mapping_1;
+        ethernet_transport->priority_mapping[ethernet_priority_1] = ethernet_priority_mapping_1;
 
         EthernetTransportDescriptor::PriorityMapping ethernet_priority_mapping_2;
         int32_t ethernet_priority_2 = 1;
         ethernet_priority_mapping_2.source_port = 5000;
         ethernet_priority_mapping_2.pcp = 1;
-        ethernet_transport->ethernet_priority_mappings[ethernet_priority_2] = ethernet_priority_mapping_2;
+        ethernet_transport->priority_mapping[ethernet_priority_2] = ethernet_priority_mapping_2;
 
         EthernetTransportDescriptor::PriorityMapping ethernet_priority_mapping_3;
         int32_t ethernet_priority_3 = 2;
         ethernet_priority_mapping_3.source_port = 5000;
         ethernet_priority_mapping_3.pcp = 2;
         ethernet_priority_mapping_3.vlan_id = 100;
-        ethernet_transport->ethernet_priority_mappings[ethernet_priority_3] = ethernet_priority_mapping_3;
+        ethernet_transport->priority_mapping[ethernet_priority_3] = ethernet_priority_mapping_3;
 
         // Link the Transport Layer to the Participant.
         qos.transport().user_transports.push_back(ethernet_transport);
diff --git a/docs/conf.py b/docs/conf.py
@@ -160,6 +160,9 @@ def download_file(url, output_path):
     :param output_path: The local path where the file will be saved.
     :return: The path to the file if downloaded successfully, or the path to an empty file otherwise.
     """
+
+    # Normalize path to avoid problems in Windows.
+    output_path = os.path.normpath(output_path)
     try:
         req = requests.get(url, allow_redirects=True, timeout=10)
         req.raise_for_status()  # Raise an error for bad responses

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`* @file calculator.hpp`
`17`	`17`	`* This header file contains the declaration of the described types in the IDL file.`
`18`	`18`	`*`
`19`		`- * This file was generated by the tool fastddsgen (version: 4.2.0 pro).`
	`19`	`+ * This file was generated by the tool fastddsgen (version: 4.2.0 Pro).`
`20`	`20`	`*/`
`21`	`21`
`22`	`22`	`#ifndef FAST_DDS_GENERATED__CALCULATOR_HPP`