Solve conflicts

Signed-off-by: Carlos Ferreira González <carlosferreira@eprosima.com>

Author: cferreiragonz

test/unittest/dds/publisher/DataWriterTests.cpp

@@ -241,8 +241,6 @@ class InstanceTopicDataTypeMock : public TopicDataType
 
 };
 
-<<<<<<< HEAD
-=======
 // Class to check dispose or unregister operations with non empty payload
 class NonEmptyPayloadInstanceTopicDataTypeMock : public InstanceTopicDataTypeMock
 {
@@ -258,154 +256,6 @@ class NonEmptyPayloadInstanceTopicDataTypeMock : public InstanceTopicDataTypeMoc
 
 };
 
-class ComputeKeyFalseDefinedInstanceDataTypeMock : public InstanceTopicDataTypeMock
-{
-public:
-
-    typedef FooType type;
-
-    ComputeKeyFalseDefinedInstanceDataTypeMock()
-        : InstanceTopicDataTypeMock()
-    {
-        max_serialized_type_size = 4u;
-        is_compute_key_provided = true;
-        set_name("unknowninstancefootype");
-    }
-
-    bool compute_key(
-            fastdds::rtps::SerializedPayload_t& /*payload*/,
-            fastdds::rtps::InstanceHandle_t& ihandle,
-            bool /*force_md5*/) override
-    {
-        // Setting instance as valid
-        ihandle.value[0] = 1;
-        return false;
-    }
-
-    bool compute_key(
-            const void* const /*data*/,
-            fastdds::rtps::InstanceHandle_t& ihandle,
-            bool /*force_md5*/) override
-    {
-        // Setting instance as valid
-        ihandle.value[0] = 1;
-        return false;
-    }
-
-};
-
-
-class ComputeKeyTrueDefinedInstanceDataTypeMock : public InstanceTopicDataTypeMock
-{
-public:
-
-    typedef FooType type;
-
-    ComputeKeyTrueDefinedInstanceDataTypeMock()
-        : InstanceTopicDataTypeMock()
-    {
-        max_serialized_type_size = 4u;
-        is_compute_key_provided = true;
-        set_name("unknowninstancefootype");
-    }
-
-    bool compute_key(
-            fastdds::rtps::SerializedPayload_t& /*payload*/,
-            fastdds::rtps::InstanceHandle_t& ihandle,
-            bool /*force_md5*/) override
-    {
-        // Setting instance as valid
-        ihandle.value[0] = 1;
-        return true;
-    }
-
-    bool compute_key(
-            const void* const /*data*/,
-            fastdds::rtps::InstanceHandle_t& ihandle,
-            bool /*force_md5*/) override
-    {
-        // Setting instance as valid
-        ihandle.value[0] = 1;
-        return true;
-    }
-
-};
-
-
-class ComputeKeyFalseUndefinedInstanceDataTypeMock : public InstanceTopicDataTypeMock
-{
-public:
-
-    typedef FooType type;
-
-    ComputeKeyFalseUndefinedInstanceDataTypeMock()
-        : InstanceTopicDataTypeMock()
-    {
-        max_serialized_type_size = 4u;
-        is_compute_key_provided = true;
-        set_name("unknowninstancefootype");
-    }
-
-    bool compute_key(
-            fastdds::rtps::SerializedPayload_t& /*payload*/,
-            fastdds::rtps::InstanceHandle_t& ihandle,
-            bool /*force_md5*/) override
-    {
-        // Setting instance as invalid
-        ihandle.clear();
-        return false;
-    }
-
-    bool compute_key(
-            const void* const /*data*/,
-            fastdds::rtps::InstanceHandle_t& ihandle,
-            bool /*force_md5*/) override
-    {
-        // Setting instance as invalid
-        ihandle.clear();
-        return false;
-    }
-
-};
-
-
-class ComputeKeyTrueUndefinedInstanceDataTypeMock : public InstanceTopicDataTypeMock
-{
-public:
-
-    typedef FooType type;
-
-    ComputeKeyTrueUndefinedInstanceDataTypeMock()
-        : InstanceTopicDataTypeMock()
-    {
-        max_serialized_type_size = 4u;
-        is_compute_key_provided = true;
-        set_name("unknowninstancefootype");
-    }
-
-    bool compute_key(
-            fastdds::rtps::SerializedPayload_t& /*payload*/,
-            fastdds::rtps::InstanceHandle_t& ihandle,
-            bool /*force_md5*/) override
-    {
-        // Setting instance as invalid
-        ihandle.clear();
-        return true;
-    }
-
-    bool compute_key(
-            const void* const /*data*/,
-            fastdds::rtps::InstanceHandle_t& ihandle,
-            bool /*force_md5*/) override
-    {
-        // Setting instance as invalid
-        ihandle.clear();
-        return true;
-    }
-
-};
-
->>>>>>> 47bfac03 (Allow empty payloads in dispose/unregister operations (#6217))
 class BoundedTopicDataTypeMock : public TopicDataType
 {
 public: