From e40eba2d001ad5138f7469d5467fbf8cb6a5e74c Mon Sep 17 00:00:00 2001
From: IkerLuengo <57146230+IkerLuengo@users.noreply.github.com>
Date: Fri, 17 Sep 2021 13:12:38 +0200
Subject: [PATCH] Changes to facilitate python bindings (#2195)

* Operators are inherited

Although these lines are legal, these 'using' structures get a parsing error in SWIG.
And since the operators are already inherited from the base class, they
are redundant, and can be removed to simplify our lives in the binding
process

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* Define operators inside the classes

This facilitates the binding to Python

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* Requested changes

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* Requested changes

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* More requested changes

Signed-off-by: Iker Luengo <ikerluengo@eprosima.com>

* Reverting changes on rtps/common headers.

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

Co-authored-by: Miguel Company <MiguelCompany@eprosima.com>
---
 include/fastdds/dds/common/InstanceHandle.hpp | 39 +++++++++++++++++++
 include/fastdds/dds/topic/TypeSupport.hpp     | 10 +----
 2 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 include/fastdds/dds/common/InstanceHandle.hpp

diff --git a/include/fastdds/dds/common/InstanceHandle.hpp b/include/fastdds/dds/common/InstanceHandle.hpp
new file mode 100644
index 00000000000..144af61e0dd
--- /dev/null
+++ b/include/fastdds/dds/common/InstanceHandle.hpp
@@ -0,0 +1,39 @@
+// Copyright 2021 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.hpp
+ *
+ */
+
+#ifndef _FASTDDS_DDS_COMMON_INSTANCEHANDLE_HPP_
+#define _FASTDDS_DDS_COMMON_INSTANCEHANDLE_HPP_
+
+#include <fastdds/rtps/common/InstanceHandle.h>
+#include <fastrtps/fastrtps_dll.h>
+
+
+namespace eprosima {
+namespace fastdds {
+namespace dds {
+
+using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t;
+
+extern RTPS_DllAPI const InstanceHandle_t HANDLE_NIL;
+
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
+
+#endif // _FASTDDS_DDS_COMMON_INSTANCEHANDLE_HPP_
diff --git a/include/fastdds/dds/topic/TypeSupport.hpp b/include/fastdds/dds/topic/TypeSupport.hpp
index 12bfd6cf593..42dd3bfa690 100644
--- a/include/fastdds/dds/topic/TypeSupport.hpp
+++ b/include/fastdds/dds/topic/TypeSupport.hpp
@@ -20,6 +20,7 @@
 #define _FASTDDS_TYPE_SUPPORT_HPP_
 
 #include <fastdds/dds/topic/TopicDataType.hpp>
+#include <fastdds/dds/common/InstanceHandle.hpp>
 #include <fastrtps/types/DynamicPubSubType.h>
 #include <fastrtps/types/TypesBase.h>
 
@@ -31,12 +32,6 @@ namespace eprosima {
 namespace fastdds {
 namespace dds {
 
-//! Handle to identiy different instances of the same Topic of a certain type.
-using InstanceHandle_t = eprosima::fastrtps::rtps::InstanceHandle_t;
-
-//! The NIL instance handle.
-extern RTPS_DllAPI const InstanceHandle_t HANDLE_NIL;
-
 class DomainParticipant;
 
 /**
@@ -54,9 +49,6 @@ class TypeSupport : public std::shared_ptr<fastdds::dds::TopicDataType>
     using ReturnCode_t = eprosima::fastrtps::types::ReturnCode_t;
 
     using Base = std::shared_ptr<fastdds::dds::TopicDataType>;
-    using Base::operator ->;
-    using Base::operator *;
-    using Base::operator bool;
 
     /**
      * @brief Constructor