Adapt to new InstanceHandle in DDS and global operators

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

Author: IkerLuengo

src/swig/fastdds/dds/common/InstanceHandle.i

@@ -0,0 +1,12 @@
+%{
+#include "fastdds/dds/common/InstanceHandle.hpp"
+%}
+
+// SWIG does not support type conversion operators correctly unless converted to a normal method
+%rename(get_guid) eprosima::fastdds::dds::InstanceHandle_t::operator const GUID_t&;
+
+//Operators declared outside the class conflict with those declared for other types
+%ignore eprosima::fastdds::dds::operator<<(std::ostream&, const InstanceHandle_t&);
+%ignore eprosima::fastdds::dds::operator>>(std::ostream&, const InstanceHandle_t&);
+
+%include "fastdds/dds/common/InstanceHandle.hpp"

src/swig/fastdds/rtps/common/EntityId_t.i

@@ -9,6 +9,9 @@
 %ignore eprosima::fastrtps::rtps::operator<<(std::ostream&, const EntityId_t&);
 %ignore eprosima::fastrtps::rtps::operator>>(std::ostream&, const EntityId_t&);
 
+%ignore eprosima::fastrtps::rtps::operator==;
+%ignore eprosima::fastrtps::rtps::operator!=;
+
 // Declare hash so that we do not get a warning
 // This will make an empty class on the target, but the user should not need this anyway.
 namespace std {
@@ -17,3 +20,21 @@ namespace std {
 }
 
 %include "fastdds/rtps/common/EntityId_t.hpp"
+
+// Declare the comparison operators as internal to the class
+%extend eprosima::fastrtps::rtps::EntityId_t {
+    bool operator==(const eprosima::fastrtps::rtps::EntityId_t& other) const
+    {
+        return *$self == other;
+    }
+
+    bool operator==(uint32_t other) const
+    {
+        return *$self == other;
+    }
+
+    bool operator!=(const eprosima::fastrtps::rtps::EntityId_t& other) const
+    {
+        return *$self != other;
+    }
+}

src/swig/fastdds/rtps/common/Guid.i

@@ -9,4 +9,28 @@
 %ignore eprosima::fastrtps::rtps::operator<<(std::ostream&, const GUID_t&);
 %ignore eprosima::fastrtps::rtps::operator>>(std::ostream&, const GUID_t&);
 
+// Ignore the global comparison operators and make them class-internal
+%ignore eprosima::fastrtps::operator==(const Time_t&, const Time_t&);
+%ignore eprosima::fastrtps::operator!=(const Time_t&, const Time_t&);
+%ignore eprosima::fastrtps::operator<(const Time_t&, const Time_t&);
+
 %include "fastdds/rtps/common/Guid.h"
+
+// Declare the comparison operators as internal to the class
+%extend eprosima::fastrtps::rtps::GUID_t {
+    bool operator==(const eprosima::fastrtps::rtps::GUID_t& other) const
+    {
+        return *$self == other;
+    }
+
+    bool operator!=(const eprosima::fastrtps::rtps::GUID_t& other) const
+    {
+        return *$self != other;
+    }
+
+    bool operator<(const eprosima::fastrtps::rtps::GUID_t& other) const
+    {
+        return *$self < other;
+    }
+}
+

src/swig/fastdds/rtps/common/Time_t.i

@@ -7,6 +7,14 @@
 // We remove the one that is not used in the user API
 // We also remove all the related operators
 %ignore eprosima::fastrtps::rtps::Time_t;
+%ignore eprosima::fastrtps::rtps::operator==(const Time_t&, const Time_t&);
+%ignore eprosima::fastrtps::rtps::operator!=(const Time_t&, const Time_t&);
+%ignore eprosima::fastrtps::rtps::operator<(const Time_t&, const Time_t&);
+%ignore eprosima::fastrtps::rtps::operator<=(const Time_t&, const Time_t&);
+%ignore eprosima::fastrtps::rtps::operator>(const Time_t&, const Time_t&);
+%ignore eprosima::fastrtps::rtps::operator>=(const Time_t&, const Time_t&);
+%ignore eprosima::fastrtps::rtps::operator+(const Time_t&, const Time_t&);
+%ignore eprosima::fastrtps::rtps::operator-(const Time_t&, const Time_t&);
 %ignore eprosima::fastrtps::rtps::operator<<(std::ostream&, const Time_t&);
 %ignore eprosima::fastrtps::rtps::operator>>(std::ostream&, const Time_t&);
 
@@ -15,4 +23,59 @@
 %ignore eprosima::fastrtps::operator<<(std::ostream&, const Time_t&);
 %ignore eprosima::fastrtps::operator>>(std::ostream&, const Time_t&);
 
+// Ignore the global comparison and arithmetic operators
+// and make them class-internal
+%ignore eprosima::fastrtps::operator==(const Time_t&, const Time_t&);
+%ignore eprosima::fastrtps::operator!=(const Time_t&, const Time_t&);
+%ignore eprosima::fastrtps::operator<(const Time_t&, const Time_t&);
+%ignore eprosima::fastrtps::operator<=(const Time_t&, const Time_t&);
+%ignore eprosima::fastrtps::operator>(const Time_t&, const Time_t&);
+%ignore eprosima::fastrtps::operator>=(const Time_t&, const Time_t&);
+%ignore eprosima::fastrtps::operator+(const Time_t&, const Time_t&);
+%ignore eprosima::fastrtps::operator-(const Time_t&, const Time_t&);
+
 %include "fastdds/rtps/common/Time_t.h"
+
+// Declare the comparison operators as internal to the class
+%extend eprosima::fastrtps::Time_t {
+    bool operator==(const eprosima::fastrtps::Time_t& other) const
+    {
+        return *$self == other;
+    }
+
+    bool operator!=(const eprosima::fastrtps::Time_t& other) const
+    {
+        return *$self != other;
+    }
+
+    bool operator<(const eprosima::fastrtps::Time_t& other) const
+    {
+        return *$self < other;
+    }
+
+    bool operator>(const eprosima::fastrtps::Time_t& other) const
+    {
+        return *$self > other;
+    }
+
+    bool operator<=(const eprosima::fastrtps::Time_t& other) const
+    {
+        return *$self <= other;
+    }
+
+    bool operator>=(const eprosima::fastrtps::Time_t& other) const
+    {
+        return *$self >= other;
+    }
+
+    eprosima::fastrtps::Time_t operator+ (const eprosima::fastrtps::Time_t& other) const
+    {
+        return *$self + other;
+    }
+
+    eprosima::fastrtps::Time_t operator- (const eprosima::fastrtps::Time_t& other) const
+    {
+        return *$self - other;
+    }
+}
+

src/swig/fastdds_wrapper.i

@@ -385,7 +385,7 @@ namespace builtin {
 %include "fastdds/rtps/common/EntityId_t.i"
 %include "fastdds/rtps/common/GuidPrefix_t.i"
 %include "fastdds/rtps/common/Guid.i"
-%include "fastdds/rtps/common/InstanceHandle.i"
+%include "fastdds/dds/common/InstanceHandle.i"
 %include "fastdds/dds/core/policy/ParameterTypes.i"
 %include "fastdds/dds/core/policy/QosPolicies.i"
 %include "fastdds/dds/topic/TopicDataType.i"