Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
eProsima · May 7, 2024 · d83b529 · d83b529
1 parent 57d534e
commit d83b529
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 22 deletions.
diff --git a/include/fastrtps/xmlparser/XMLProfileManager.h b/include/fastrtps/xmlparser/XMLProfileManager.h
@@ -225,21 +225,7 @@ class XMLProfileManager
      * FastDDS's Domain calls this method automatically on its destructor, but
      * if using XMLProfileManager outside of FastDDS, it should be called manually.
      */
-<<<<<<< HEAD
-    RTPS_DllAPI static void DeleteInstance()
-    {
-        participant_profiles_.clear();
-        publisher_profiles_.clear();
-        subscriber_profiles_.clear();
-        requester_profiles_.clear();
-        replier_profiles_.clear();
-        topic_profiles_.clear();
-        xml_files_.clear();
-        transport_profiles_.clear();
-    }
-=======
     RTPS_DllAPI static void DeleteInstance();
->>>>>>> 8cb447bb2 (Fix some leaks in XML DynamicTypes Parser (#4717))
 
     /**
      * Retrieves a DynamicPubSubType for the given dynamic type name.

diff --git a/src/cpp/rtps/xmlparser/XMLProfileManager.cpp b/src/cpp/rtps/xmlparser/XMLProfileManager.cpp
@@ -696,7 +696,6 @@ XMLP_ret XMLProfileManager::extractReplierProfile(
 
 void XMLProfileManager::DeleteInstance()
 {
-    participant_factory_profiles_.clear();
     participant_profiles_.clear();
     publisher_profiles_.clear();
     subscriber_profiles_.clear();

diff --git a/test/unittest/xmlparser/XMLParserTests.cpp b/test/unittest/xmlparser/XMLParserTests.cpp
@@ -66,14 +66,7 @@ TEST_F(XMLParserTests, regressions)
     EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/19851_profile_bin.xml", root));
     EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/simple_participant_profiles_nok.xml", root));
     EXPECT_EQ(XMLP_ret::XML_OK, XMLParser::loadXML("regressions/simple_participant_profiles_ok.xml", root));
-<<<<<<< HEAD
-=======
-    EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/20186_profile_bin.xml", root));
-    EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/20187_profile_bin.xml", root));
-    EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/20608_profile_bin.xml", root));
-    EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/20610_profile_bin.xml", root));
     EXPECT_EQ(XMLP_ret::XML_ERROR, XMLParser::loadXML("regressions/20732_profile_bin.xml", root));
->>>>>>> 8cb447bb2 (Fix some leaks in XML DynamicTypes Parser (#4717))
 }
 
 TEST_F(XMLParserTests, NoFile)