Changes to facilitate bindings to python

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_

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

include/fastdds/rtps/common/EntityId_t.hpp

@@ -231,14 +231,7 @@ inline bool operator !=(
         const EntityId_t& id1,
         const EntityId_t& id2)
 {
-    for (uint8_t i = 0; i < 4; ++i)
-    {
-        if (id1.value[i] != id2.value[i])
-        {
-            return true;
-        }
-    }
-    return false;
+    return !(id1 == id2);
 }
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC

include/fastdds/rtps/common/Guid.h

@@ -122,81 +122,62 @@ struct RTPS_DllAPI GUID_t
         return *reinterpret_cast<const InstanceHandle_t*>(this);
     }
 
-};
-
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-/**
- * GUID comparison operator
- * @param g1 First GUID to compare
- * @param g2 Second GUID to compare
- * @return True if equal
- */
-inline bool operator ==(
-        const GUID_t& g1,
-        const GUID_t& g2)
-{
-    if (g1.guidPrefix == g2.guidPrefix && g1.entityId == g2.entityId)
-    {
-        return true;
-    }
-    else
+    /**
+     * GUID comparison operator
+     * @param other Second GUID to compare
+     * @return True if equal
+     */
+    inline bool operator ==(
+            const GUID_t& other) const
     {
-        return false;
+        return (guidPrefix == other.guidPrefix && entityId == other.entityId);
     }
-}
 
-/**
- * GUID comparison operator
- * @param g1 First GUID to compare
- * @param g2 Second GUID to compare
- * @return True if not equal
- */
-inline bool operator !=(
-        const GUID_t& g1,
-        const GUID_t& g2)
-{
-    if (g1.guidPrefix != g2.guidPrefix || g1.entityId != g2.entityId)
-    {
-        return true;
-    }
-    else
+    /**
+     * GUID comparison operator
+     * @param other Second GUID to compare
+     * @return True if not equal
+     */
+    inline bool operator !=(
+            const GUID_t& other) const
     {
-        return false;
+        return (guidPrefix != other.guidPrefix || entityId != other.entityId);
     }
-}
 
-inline bool operator <(
-        const GUID_t& g1,
-        const GUID_t& g2)
-{
-    for (uint8_t i = 0; i < 12; ++i)
-    {
-        if (g1.guidPrefix.value[i] < g2.guidPrefix.value[i])
-        {
-            return true;
-        }
-        else if (g1.guidPrefix.value[i] > g2.guidPrefix.value[i])
-        {
-            return false;
-        }
-    }
-    for (uint8_t i = 0; i < 4; ++i)
+    inline bool operator <(
+            const GUID_t& other) const
     {
-        if (g1.entityId.value[i] < g2.entityId.value[i])
+        for (uint8_t i = 0; i < 12; ++i)
         {
-            return true;
+            if (guidPrefix.value[i] < other.guidPrefix.value[i])
+            {
+                return true;
+            }
+            else if (guidPrefix.value[i] > other.guidPrefix.value[i])
+            {
+                return false;
+            }
         }
-        else if (g1.entityId.value[i] > g2.entityId.value[i])
+        for (uint8_t i = 0; i < 4; ++i)
         {
-            return false;
+            if (entityId.value[i] < other.entityId.value[i])
+            {
+                return true;
+            }
+            else if (entityId.value[i] > other.entityId.value[i])
+            {
+                return false;
+            }
         }
+        return false;
     }
-    return false;
-}
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
+};
+
 const GUID_t c_Guid_Unknown;
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC

include/fastdds/rtps/common/InstanceHandle.h

@@ -126,41 +126,50 @@ struct RTPS_DllAPI InstanceHandle_t
         return *reinterpret_cast<const GUID_t*>(this);
     }
 
-};
-
-const InstanceHandle_t c_InstanceHandle_Unknown;
+    /**
+     * Strictly less than operator
+     * @param other The other InstanceHandle_t to compare
+     * @return True if the value of this handle lexicographically preceeds that of \p other
+     */
+    inline bool operator <(
+            const InstanceHandle_t& other) const
+    {
+        return memcmp(value, other.value, 16) < 0;
+    }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-/**
- * Comparison operator
- * @param ihandle1 First InstanceHandle_t to compare
- * @param ihandle2 Second InstanceHandle_t to compare
- * @return True if equal
- */
-inline bool operator ==(
-        const InstanceHandle_t& ihandle1,
-        const InstanceHandle_t& ihandle2)
-{
-    for (uint8_t i = 0; i < 16; ++i)
+    /**
+     * Comparison operator
+     * @param other Second InstanceHandle_t to compare
+     * @return True if equal
+     */
+    inline bool operator ==(
+            const InstanceHandle_t& other) const
     {
-        if (ihandle1.value[i] != ihandle2.value[i])
+        for (uint8_t i = 0; i < 16; ++i)
         {
-            return false;
+            if (value[i] != other.value[i])
+            {
+                return false;
+            }
         }
+        return true;
     }
-    return true;
-}
 
-inline bool operator !=(
-        const InstanceHandle_t& ihandle1,
-        const InstanceHandle_t& ihandle2)
-{
-    return !(ihandle1 == ihandle2);
-}
+    inline bool operator !=(
+            const InstanceHandle_t& other) const
+    {
+        return !(*this == other);
+    }
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
+};
+
+const InstanceHandle_t c_InstanceHandle_Unknown;
+
+
 /**
  * Convert InstanceHandle_t to GUID
  * @param guid GUID to store the results
@@ -207,13 +216,6 @@ inline GUID_t iHandle2GUID(
     return guid;
 }
 
-inline bool operator <(
-        const InstanceHandle_t& h1,
-        const InstanceHandle_t& h2)
-{
-    return memcmp(h1.value, h2.value, 16) < 0;
-}
-
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 /**