Fix conflicts.

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

Author: MiguelCompany

fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt

@@ -1,18 +1,4 @@
 
-# Copyright 2025 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.
-
 cmake_minimum_required(VERSION 3.20)
 
 # SWIG: use standard target name.
@@ -44,9 +30,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 #Create library for C++ types
 add_library(${PROJECT_NAME} SHARED
         calculatorTypeObjectSupport.cxx
-        calculatorPubSubTypes.cxx
-        calculatorClient.cxx
-        calculatorServer.cxx
         )
 if(WIN32)
     target_compile_definitions(${PROJECT_NAME} PRIVATE EPROSIMA_USER_DLL_EXPORT)

fastdds_python_examples/RPCExample/generated_code/calculator.hpp

@@ -16,20 +16,14 @@
  * @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.1.0).
+ * This file was generated by the tool fastddsgen (version: 4.0.4).
  */
 
 #ifndef FAST_DDS_GENERATED__CALCULATOR_HPP
 #define FAST_DDS_GENERATED__CALCULATOR_HPP
 
 #include <cstdint>
-#include <string>
 #include <utility>
-#include <fastcdr/cdr/fixed_size_string.hpp>
-#include <fastcdr/xcdr/optional.hpp>
-#include <fastdds/dds/rpc/exceptions/RpcOperationError.hpp>
-#include <fastdds/dds/rpc/interfaces/RpcFuture.hpp>
-
 
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
@@ -57,136 +51,36 @@
 
 namespace calculator_base {
 
-/*!
- * @brief This class implements the user exception calculator_base::OverflowException
- * @ingroup calculator
- */
-class eProsima_user_DllExport OverflowException : public eprosima::fastdds::dds::rpc::RpcOperationError
-{
-public:
-
-    /**
-     * Default constructor.
-     */
-    OverflowException()
-        : OverflowException("OverflowException")
-    {
-    }
-
-    /**
-     * Constructor.
-     */
-    OverflowException(
-            const std::string& message)
-        : eprosima::fastdds::dds::rpc::RpcOperationError(message)
-    {
-    }
-
-    /**
-     * Constructor.
-     */
-    OverflowException(
-            const char* message)
-        : eprosima::fastdds::dds::rpc::RpcOperationError(message)
-    {
-    }
-
-    /**
-     * Copy constructor.
-     */
-    OverflowException(
-            const OverflowException& other) noexcept = default;
-
-    /**
-     * Copy assignment.
-     */
-    OverflowException& operator =(
-            const OverflowException& other) noexcept = default;
-
-    /**
-     * Destructor.
-     */
-    virtual ~OverflowException() noexcept = default;
-
-
-
-private:
-
-
-};
-
-
 /*!
  * @brief This class represents the interface Adder defined by the user in the IDL file.
  * @ingroup calculator
  */
-class eProsima_user_DllExport Adder 
+class CALCULATOR_DllAPI Adder 
 {
 public:
-    virtual ~Adder() = default;
-
-
-    virtual eprosima::fastdds::dds::rpc::RpcFuture<int32_t> addition(
-            /*in*/ int32_t value1,
-            /*in*/ int32_t value2) = 0;
 
 };
-
-
-
 /*!
  * @brief This class represents the interface Subtractor defined by the user in the IDL file.
  * @ingroup calculator
  */
-class eProsima_user_DllExport Subtractor 
+class CALCULATOR_DllAPI Subtractor 
 {
 public:
-    virtual ~Subtractor() = default;
-
-
-    virtual eprosima::fastdds::dds::rpc::RpcFuture<int32_t> subtraction(
-            /*in*/ int32_t value1,
-            /*in*/ int32_t value2) = 0;
 
 };
 
-
-
 } // namespace calculator_base
-
-namespace detail {
-
-struct Calculator_representation_limits_Out;
-
-}  // namespace detail
-
 /*!
  * @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::Adder, public calculator_base::Subtractor
+class CALCULATOR_DllAPI Calculator : public calculator_base::Adder, public calculator_base::Subtractor
 {
 public:
-    virtual ~Calculator() = default;
-
-
-    virtual eprosima::fastdds::dds::rpc::RpcFuture<detail::Calculator_representation_limits_Out> representation_limits(
-    ) = 0;
-
-};
 
-namespace detail {
-
-struct Calculator_representation_limits_Out
-{
-    int32_t min_value;
-    int32_t max_value;
 };
 
-
-}  // namespace detail
-
-
 #endif // _FAST_DDS_GENERATED_CALCULATOR_HPP_
 
 

fastdds_python_examples/RPCExample/generated_code/calculator.i

@@ -16,16 +16,10 @@
  * @file calculator.i
  * This header file contains the SWIG interface of the described types in the IDL file.
  *
- * This file was generated by the tool fastddsgen (version: 4.1.0).
+ * This file was generated by the tool fastddsgen (version: 4.0.4).
  */
 
-%module(threads="1",directors="1",moduleimport="if __import__('os').name == 'nt': import win32api; win32api.LoadLibrary('calculator.dll')\nif __package__ or '.' in __name__:\n    from . import _calculatorWrapper\nelse:\n    import _calculatorWrapper") calculator
-
-// We have enabled threads because the RPC server directors will call the target language environment
-// from the C++ server threads, but we don't want the calls from the target language to release their
-// locks (e.g. Python GIL) when calling the C++ methods.
-// See a very nice explanation at https://github.com/swig/swig/issues/927#issuecomment-289279243
-%feature("nothreadallow");
+%module(moduleimport="if __import__('os').name == 'nt': import win32api; win32api.LoadLibrary('calculator.dll')\nif __package__ or '.' in __name__:\n    from . import _calculatorWrapper\nelse:\n    import _calculatorWrapper") calculator
 
 // If using windows in debug, it would try to use python_d, which would not be found.
 %begin %{
@@ -36,12 +30,9 @@
 %}
 
 // SWIG helper modules
-%include "exception.i"
 %include "stdint.i"
 %include "std_array.i"
 %include "std_map.i"
-%include "std_pair.i"
-%include "std_shared_ptr.i"
 %include "std_string.i"
 %include "std_vector.i"
 %include "typemaps.i"
@@ -58,90 +49,15 @@
 
 %{
 #include "calculator.hpp"
-#include "calculatorClient.hpp"
-#include "calculatorServer.hpp"
-#include "calculatorServerImpl.hpp"
 
 #include <fastdds/dds/core/LoanableSequence.hpp>
 %}
 
 %include <fastcdr/config.h>
-%import(module="fastdds") "fastcdr/xcdr/optional.hpp"
-%import(module="fastdds") "fastcdr/cdr/fixed_size_string.hpp"
 %import(module="fastdds") "fastdds/dds/core/LoanableCollection.hpp"
 %import(module="fastdds") "fastdds/dds/core/LoanableTypedCollection.hpp"
 %import(module="fastdds") "fastdds/dds/core/LoanableSequence.hpp"
 
-%import(module="fastdds") "fastdds/dds/rpc/exceptions/RpcException.hpp"
-%import(module="fastdds") "fastdds/dds/rpc/exceptions/RpcOperationError.hpp"
-
-%exception {
-    try
-    {
-        $action
-    }
-    catch (const eprosima::fastdds::dds::rpc::RpcException& ex)
-    {
-        SWIG_exception(SWIG_RuntimeError, ex.what());
-    }
-    catch (const std::exception& ex)
-    {
-        SWIG_exception(SWIG_RuntimeError, ex.what());
-    }
-    catch (...)
-    {
-        SWIG_exception(SWIG_RuntimeError,"Unknown exception");
-    }
-}
-
-// Code for std::future taken from https://github.com/swig/swig/issues/1828#issuecomment-648449092
-namespace eprosima::fastdds::dds::rpc
-{
-template <class R>
-class RpcFuture {
- public:
-    RpcFuture() noexcept;
-    RpcFuture(RpcFuture &&) noexcept;
-    RpcFuture(const RpcFuture& rhs) = delete;
-    ~RpcFuture();
-    RpcFuture& operator=(const RpcFuture& rhs) = delete;
-    RpcFuture& operator=(RpcFuture&&) noexcept;
-
-    // retrieving the value
-    R get();
-
-    // functions to check state
-    bool valid() const noexcept;
-    void wait() const;
-
-/*
-    template <class Rep, class Period>
-    future_status wait_for(const chrono::duration<Rep, Period>& rel_time) const;
-    template <class Clock, class Duration>
-    future_status wait_until(const chrono::time_point<Clock, Duration>& abs_time) const;
-*/
-};
-
-}
-
-%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<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<detail::Calculator_representation_limits_Out>> *), SWIG_POINTER_OWN);
-}
-
-%shared_ptr(eprosima::fastdds::dds::rpc::RpcFuture<int32_t>);
-%template(int32_t_rpc_future) eprosima::fastdds::dds::rpc::RpcFuture<int32_t>;
-
-%typemap(out, optimal="1") eprosima::fastdds::dds::rpc::RpcFuture<int32_t> {
-  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<int32_t>> *), SWIG_POINTER_OWN);
-}
-
-%exception;
-
 %define %traits_penumn(Type...)
   %fragment(SWIG_Traits_frag(Type),"header",
         fragment="StdTraits") {
@@ -155,58 +71,8 @@ namespace swig {
 %enddef
 
 
-
-%shared_ptr(calculator_base::Adder);
-
-
-
-%shared_ptr(calculator_base::Subtractor);
-
-
-
-<<<<<<< HEAD
-%shared_ptr(calculator_base::BasicCalculator);
-%shared_ptr(calculator_base::BasicCalculatorServer);
-%extend calculator_base::BasicCalculatorServer
-{
-    void run()
-    {
-        Py_BEGIN_ALLOW_THREADS
-        self->run();
-        Py_END_ALLOW_THREADS
-    }
-}
-
-%shared_ptr(calculator_base::BasicCalculatorServer_IServerImplementation);
-%shared_ptr(calculator_base::BasicCalculatorServerImplementation);
-%feature("director") calculator_base::BasicCalculatorServerImplementation;
-
-
-
-=======
->>>>>>> e143c3b (Remove `@feed` operations from example (#256))
-%shared_ptr(Calculator);
-%shared_ptr(CalculatorServer);
-%extend CalculatorServer
-{
-    void run()
-    {
-        Py_BEGIN_ALLOW_THREADS
-        self->run();
-        Py_END_ALLOW_THREADS
-    }
-}
-
-%shared_ptr(CalculatorServer_IServerImplementation);
-%shared_ptr(CalculatorServerImplementation);
-%feature("director") CalculatorServerImplementation;
-
-
 // Include the class interfaces
 %include "calculator.hpp"
-%include "calculatorClient.hpp"
-%include "calculatorServer.hpp"
-%include "calculatorServerImpl.hpp"
 
 // Include the corresponding TopicDataType
 %include "calculatorPubSubTypes.i"