Refs #23703. Apply suggestion.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

Author: MiguelCompany

fastdds_python_examples/RPCExample/calculator.idl

@@ -32,14 +32,10 @@ module calculator_base
         // Returns the result of value1 - value2
         long subtraction(in long value1, in long value2) raises(OverflowException);
     };
-
-    interface BasicCalculator : Adder, Subtractor
-    {
-        // Returns the minimum and maximum representable values
-        void representation_limits(out long min_value, out long max_value);
-    };
 };
 
-interface Calculator : calculator_base::BasicCalculator
+interface Calculator : calculator_base::Adder, calculator_base::Subtractor
 {
+    // Returns the minimum and maximum representable values
+    void representation_limits(out long min_value, out long max_value);
 };

fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt

@@ -41,13 +41,6 @@ find_package(fastdds 3 REQUIRED)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-if(NOT WIN32)
-    # Default values for shared library suffix in MacOS
-    if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-        set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
-    endif()
-endif()
-
 #Create library for C++ types
 add_library(${PROJECT_NAME} SHARED
         calculatorTypeObjectSupport.cxx

fastdds_python_examples/RPCExample/generated_code/calculator.hpp

@@ -152,30 +152,32 @@ class eProsima_user_DllExport Subtractor
 
 
 
+} // namespace calculator_base
+
 namespace detail {
 
-struct BasicCalculator_representation_limits_Out;
+struct Calculator_representation_limits_Out;
 
 }  // namespace detail
 
 /*!
- * @brief This class represents the interface BasicCalculator defined by the user in the IDL file.
+ * @brief This class represents the interface Calculator defined by the user in the IDL file.
  * @ingroup calculator
  */
-class eProsima_user_DllExport BasicCalculator : public calculator_base::Adder, public calculator_base::Subtractor
+class eProsima_user_DllExport Calculator : public calculator_base::Adder, public calculator_base::Subtractor
 {
 public:
-    virtual ~BasicCalculator() = default;
+    virtual ~Calculator() = default;
 
 
-    virtual eprosima::fastdds::dds::rpc::RpcFuture<calculator_base::detail::BasicCalculator_representation_limits_Out> representation_limits(
+    virtual eprosima::fastdds::dds::rpc::RpcFuture<detail::Calculator_representation_limits_Out> representation_limits(
     ) = 0;
 
 };
 
 namespace detail {
 
-struct BasicCalculator_representation_limits_Out
+struct Calculator_representation_limits_Out
 {
     int32_t min_value;
     int32_t max_value;
@@ -185,21 +187,6 @@ struct BasicCalculator_representation_limits_Out
 }  // namespace detail
 
 
-} // namespace calculator_base
-
-/*!
- * @brief This class represents the interface Calculator defined by the user in the IDL file.
- * @ingroup calculator
- */
-class eProsima_user_DllExport Calculator : public calculator_base::BasicCalculator
-{
-public:
-    virtual ~Calculator() = default;
-
-};
-
-
-
 #endif // _FAST_DDS_GENERATED_CALCULATOR_HPP_
 
 

fastdds_python_examples/RPCExample/generated_code/calculator.i

@@ -132,12 +132,12 @@ class RpcFuture {
 
 }
 
-%shared_ptr(eprosima::fastdds::dds::rpc::RpcFuture<calculator_base::detail::BasicCalculator_representation_limits_Out>);
-%template(calculator_base_detail_BasicCalculator_representation_limits_Out_rpc_future) eprosima::fastdds::dds::rpc::RpcFuture<calculator_base::detail::BasicCalculator_representation_limits_Out>;
+%shared_ptr(eprosima::fastdds::dds::rpc::RpcFuture<detail::Calculator_representation_limits_Out>);
+%template(detail_Calculator_representation_limits_Out_rpc_future) eprosima::fastdds::dds::rpc::RpcFuture<detail::Calculator_representation_limits_Out>;
 
-%typemap(out, optimal="1") eprosima::fastdds::dds::rpc::RpcFuture<calculator_base::detail::BasicCalculator_representation_limits_Out> {
+%typemap(out, optimal="1") eprosima::fastdds::dds::rpc::RpcFuture<detail::Calculator_representation_limits_Out> {
   std::shared_ptr<$1_ltype> *smartresult = new std::shared_ptr<$1_ltype>(new $1_ltype($1));
-  $result = SWIG_NewPointerObj(SWIG_as_voidptr(smartresult), $descriptor(std::shared_ptr< eprosima::fastdds::dds::rpc::RpcFuture<calculator_base::detail::BasicCalculator_representation_limits_Out>> *), SWIG_POINTER_OWN);
+  $result = SWIG_NewPointerObj(SWIG_as_voidptr(smartresult), $descriptor(std::shared_ptr< eprosima::fastdds::dds::rpc::RpcFuture<detail::Calculator_representation_limits_Out>> *), SWIG_POINTER_OWN);
 }
 
 %shared_ptr(eprosima::fastdds::dds::rpc::RpcFuture<int32_t>);
@@ -172,13 +172,6 @@ namespace swig {
 
 
 
-%shared_ptr(calculator_base::BasicCalculator);
-%shared_ptr(calculator_base::BasicCalculatorServer_IServerImplementation);
-%shared_ptr(calculator_base::BasicCalculatorServerImplementation);
-%feature("director") calculator_base::BasicCalculatorServerImplementation;
-
-
-
 %shared_ptr(Calculator);
 %shared_ptr(CalculatorServer_IServerImplementation);
 %shared_ptr(CalculatorServerImplementation);