Update to new ReturnCode_t (#74)

JLBuenoLopez · richiware · cferreiragonz · commit 860a83fa1604 · 2024-04-29T15:15:59.000+02:00
Signed-off-by: Ricardo González Moreno &lt;ricardo@richiware.dev&gt;
Co-authored-by: Ricardo González Moreno &lt;ricardo@richiware.dev&gt;
diff --git a/include/LateJoiner.h b/include/LateJoiner.h
@@ -437,7 +437,7 @@ void DelayedEndpointDestruction<ReaderWriter>::operator ()(
 
         // and we removed the endpoint: Domain::removeDataWriter or Domain::removeDataReader
         ret = (manager.*LateJoinerDataTraits<ReaderWriter>::remove_endpoint_function)(endpoint);
-        if (ReturnCode_t::RETCODE_OK != ret)
+        if (RETCODE_OK != ret)
         {
             LOG_ERROR("Error deleting Endpoint");
         }
diff --git a/src/DiscoveryServerManager.cpp b/src/DiscoveryServerManager.cpp
@@ -113,7 +113,7 @@ DiscoveryServerManager::DiscoveryServerManager(
                 tinyxml2::XMLPrinter printer;
                 profiles->Accept(&printer);
                 std::string xmlString = R"(")" + std::string(printer.CStr()) + R"(")";
-                if (ReturnCode_t::RETCODE_OK ==
+                if (RETCODE_OK ==
                         DomainParticipantFactory::get_instance()->load_XML_profiles_string(xmlString.c_str(),
                         std::string(printer.CStr()).length()))
                 {
@@ -427,7 +427,7 @@ ReturnCode_t DiscoveryServerManager::deleteDataReader(
 {
     if (dr == nullptr)
     {
-        return ReturnCode_t::RETCODE_ERROR;
+        return RETCODE_ERROR;
     }
     fastdds::dds::Subscriber* sub = nullptr;
     {
@@ -439,15 +439,15 @@ ReturnCode_t DiscoveryServerManager::deleteDataReader(
     {
         return sub->delete_datareader(dr);
     }
-    return ReturnCode_t::RETCODE_ERROR;
+    return RETCODE_ERROR;
 }
 
 ReturnCode_t DiscoveryServerManager::deleteDataWriter(
         DataWriter* dw)
 {
     if (dw == nullptr)
     {
-        return ReturnCode_t::RETCODE_ERROR;
+        return RETCODE_ERROR;
     }
     fastdds::dds::Publisher* pub = nullptr;
     {
@@ -459,7 +459,7 @@ ReturnCode_t DiscoveryServerManager::deleteDataWriter(
     {
         return pub->delete_datawriter(dw);
     }
-    return ReturnCode_t::RETCODE_ERROR;
+    return RETCODE_ERROR;
 }
 
 ReturnCode_t DiscoveryServerManager::deleteParticipant(
@@ -468,7 +468,7 @@ ReturnCode_t DiscoveryServerManager::deleteParticipant(
     {
         if (participant == nullptr)
         {
-            return ReturnCode_t::RETCODE_ERROR;
+            return RETCODE_ERROR;
         }
 
         std::lock_guard<std::recursive_mutex> lock(management_mutex);
@@ -477,7 +477,7 @@ ReturnCode_t DiscoveryServerManager::deleteParticipant(
         entity_map.erase(participant->guid());
 
         ReturnCode_t ret = participant->delete_contained_entities();
-        if (ret != ReturnCode_t::RETCODE_OK)
+        if (ret != RETCODE_OK)
         {
             LOG_ERROR("Error cleaning up participant entities");
         }
@@ -704,13 +704,13 @@ void DiscoveryServerManager::onTerminate()
         entity.second->set_listener(nullptr);
 
         ReturnCode_t ret = entity.second->delete_contained_entities();
-        if (ReturnCode_t::RETCODE_OK != ret)
+        if (RETCODE_OK != ret)
         {
             LOG_ERROR("Error cleaning up client entities");
         }
 
         ret = DomainParticipantFactory::get_instance()->delete_participant(entity.second);
-        if (ReturnCode_t::RETCODE_OK != ret)
+        if (RETCODE_OK != ret)
         {
             LOG_ERROR("Error deleting Client");
         }
@@ -723,13 +723,13 @@ void DiscoveryServerManager::onTerminate()
         entity.second->set_listener(nullptr);
 
         ReturnCode_t ret = entity.second->delete_contained_entities();
-        if (ReturnCode_t::RETCODE_OK != ret)
+        if (RETCODE_OK != ret)
         {
             LOG_ERROR("Error cleaning up simple entities");
         }
 
         ret = DomainParticipantFactory::get_instance()->delete_participant(entity.second);
-        if (ReturnCode_t::RETCODE_OK != ret)
+        if (RETCODE_OK != ret)
         {
             LOG_ERROR("Error deleting Simple Discovery Entity");
         }
@@ -741,13 +741,13 @@ void DiscoveryServerManager::onTerminate()
         entity.second->set_listener(nullptr);
 
         ReturnCode_t ret = entity.second->delete_contained_entities();
-        if (ReturnCode_t::RETCODE_OK != ret)
+        if (RETCODE_OK != ret)
         {
             LOG_ERROR("Error cleaning up server entities");
         }
 
         ret = DomainParticipantFactory::get_instance()->delete_participant(entity.second);
-        if (ReturnCode_t::RETCODE_OK != ret)
+        if (RETCODE_OK != ret)
         {
             LOG_ERROR("Error deleting Server");
         }
@@ -824,7 +824,7 @@ void DiscoveryServerManager::loadServer(
 
     // retrieve profile attributes
     DomainParticipantQos dpQOS;
-    if (ReturnCode_t::RETCODE_OK !=
+    if (RETCODE_OK !=
             DomainParticipantFactory::get_instance()->get_participant_qos_from_profile(std::string(profile_name),
             dpQOS))
     {
@@ -996,7 +996,7 @@ void DiscoveryServerManager::loadClient(
 
     // retrieve profile attributes
     DomainParticipantQos dpQOS;
-    if (ReturnCode_t::RETCODE_OK !=
+    if (RETCODE_OK !=
             DomainParticipantFactory::get_instance()->get_participant_qos_from_profile(std::string(profile_name),
             dpQOS))
     {
@@ -1270,7 +1270,7 @@ void DiscoveryServerManager::loadSimple(
     if (profile_name != nullptr)
     {
         // retrieve profile attributes
-        if (ReturnCode_t::RETCODE_OK !=
+        if (RETCODE_OK !=
                 DomainParticipantFactory::get_instance()->get_participant_qos_from_profile(std::string(profile_name),
                 dpQOS))
         {
@@ -1645,7 +1645,7 @@ void DiscoveryServerManager::MapServerInfo(
     // I must load the prefix from the profile
     // retrieve profile QOS
     pqos = std::make_shared<DomainParticipantQos>();
-    if (ReturnCode_t::RETCODE_OK !=
+    if (RETCODE_OK !=
             DomainParticipantFactory::get_instance()->get_participant_qos_from_profile(profile_name, *pqos))
     {
         LOG_ERROR("DiscoveryServerManager::loadServer couldn't load profile " << profile_name);
diff --git a/src/LateJoiner.cpp b/src/LateJoiner.cpp
@@ -70,7 +70,7 @@ void DelayedParticipantDestruction::operator ()(
         std::string name = p->get_qos().name().to_string();
 
         ReturnCode_t ret = manager.deleteParticipant(p);
-        if (ReturnCode_t::RETCODE_OK != ret)
+        if (RETCODE_OK != ret)
         {
             LOG_ERROR("Error during delayed deletion of Participant");
         }

Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ void DelayedEndpointDestruction<ReaderWriter>::operator ()(`
`437`	`437`
`438`	`438`	`// and we removed the endpoint: Domain::removeDataWriter or Domain::removeDataReader`
`439`	`439`	`ret = (manager.*LateJoinerDataTraits<ReaderWriter>::remove_endpoint_function)(endpoint);`
`440`		`- if (ReturnCode_t::RETCODE_OK != ret)`
	`440`	`+ if (RETCODE_OK != ret)`
`441`	`441`	`{`
`442`	`442`	`LOG_ERROR("Error deleting Endpoint");`
`443`	`443`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ DiscoveryServerManager::DiscoveryServerManager(`
`113`	`113`	`tinyxml2::XMLPrinter printer;`
`114`	`114`	`profiles->Accept(&printer);`
`115`	`115`	`std::string xmlString = R"(")" + std::string(printer.CStr()) + R"(")";`
`116`		`- if (ReturnCode_t::RETCODE_OK ==`
	`116`	`+ if (RETCODE_OK ==`
`117`	`117`	`DomainParticipantFactory::get_instance()->load_XML_profiles_string(xmlString.c_str(),`
`118`	`118`	`std::string(printer.CStr()).length()))`
`119`	`119`	`{`
`@@ -427,7 +427,7 @@ ReturnCode_t DiscoveryServerManager::deleteDataReader(`
`427`	`427`	`{`
`428`	`428`	`if (dr == nullptr)`
`429`	`429`	`{`
`430`		`- return ReturnCode_t::RETCODE_ERROR;`
	`430`	`+ return RETCODE_ERROR;`
`431`	`431`	`}`
`432`	`432`	`fastdds::dds::Subscriber* sub = nullptr;`
`433`	`433`	`{`
`@@ -439,15 +439,15 @@ ReturnCode_t DiscoveryServerManager::deleteDataReader(`
`439`	`439`	`{`
`440`	`440`	`return sub->delete_datareader(dr);`
`441`	`441`	`}`
`442`		`- return ReturnCode_t::RETCODE_ERROR;`
	`442`	`+ return RETCODE_ERROR;`
`443`	`443`	`}`
`444`	`444`
`445`	`445`	`ReturnCode_t DiscoveryServerManager::deleteDataWriter(`
`446`	`446`	`DataWriter* dw)`
`447`	`447`	`{`
`448`	`448`	`if (dw == nullptr)`
`449`	`449`	`{`
`450`		`- return ReturnCode_t::RETCODE_ERROR;`
	`450`	`+ return RETCODE_ERROR;`
`451`	`451`	`}`
`452`	`452`	`fastdds::dds::Publisher* pub = nullptr;`
`453`	`453`	`{`
`@@ -459,7 +459,7 @@ ReturnCode_t DiscoveryServerManager::deleteDataWriter(`
`459`	`459`	`{`
`460`	`460`	`return pub->delete_datawriter(dw);`
`461`	`461`	`}`
`462`		`- return ReturnCode_t::RETCODE_ERROR;`
	`462`	`+ return RETCODE_ERROR;`
`463`	`463`	`}`
`464`	`464`
`465`	`465`	`ReturnCode_t DiscoveryServerManager::deleteParticipant(`
`@@ -468,7 +468,7 @@ ReturnCode_t DiscoveryServerManager::deleteParticipant(`
`468`	`468`	`{`
`469`	`469`	`if (participant == nullptr)`
`470`	`470`	`{`
`471`		`- return ReturnCode_t::RETCODE_ERROR;`
	`471`	`+ return RETCODE_ERROR;`
`472`	`472`	`}`
`473`	`473`
`474`	`474`	`std::lock_guard<std::recursive_mutex> lock(management_mutex);`
`@@ -477,7 +477,7 @@ ReturnCode_t DiscoveryServerManager::deleteParticipant(`
`477`	`477`	`entity_map.erase(participant->guid());`
`478`	`478`
`479`	`479`	`ReturnCode_t ret = participant->delete_contained_entities();`
`480`		`- if (ret != ReturnCode_t::RETCODE_OK)`
	`480`	`+ if (ret != RETCODE_OK)`
`481`	`481`	`{`
`482`	`482`	`LOG_ERROR("Error cleaning up participant entities");`
`483`	`483`	`}`
`@@ -704,13 +704,13 @@ void DiscoveryServerManager::onTerminate()`
`704`	`704`	`entity.second->set_listener(nullptr);`
`705`	`705`
`706`	`706`	`ReturnCode_t ret = entity.second->delete_contained_entities();`
`707`		`- if (ReturnCode_t::RETCODE_OK != ret)`
	`707`	`+ if (RETCODE_OK != ret)`
`708`	`708`	`{`
`709`	`709`	`LOG_ERROR("Error cleaning up client entities");`
`710`	`710`	`}`
`711`	`711`
`712`	`712`	`ret = DomainParticipantFactory::get_instance()->delete_participant(entity.second);`
`713`		`- if (ReturnCode_t::RETCODE_OK != ret)`
	`713`	`+ if (RETCODE_OK != ret)`
`714`	`714`	`{`
`715`	`715`	`LOG_ERROR("Error deleting Client");`
`716`	`716`	`}`
`@@ -723,13 +723,13 @@ void DiscoveryServerManager::onTerminate()`
`723`	`723`	`entity.second->set_listener(nullptr);`
`724`	`724`
`725`	`725`	`ReturnCode_t ret = entity.second->delete_contained_entities();`
`726`		`- if (ReturnCode_t::RETCODE_OK != ret)`
	`726`	`+ if (RETCODE_OK != ret)`
`727`	`727`	`{`
`728`	`728`	`LOG_ERROR("Error cleaning up simple entities");`
`729`	`729`	`}`
`730`	`730`
`731`	`731`	`ret = DomainParticipantFactory::get_instance()->delete_participant(entity.second);`
`732`		`- if (ReturnCode_t::RETCODE_OK != ret)`
	`732`	`+ if (RETCODE_OK != ret)`
`733`	`733`	`{`
`734`	`734`	`LOG_ERROR("Error deleting Simple Discovery Entity");`
`735`	`735`	`}`
`@@ -741,13 +741,13 @@ void DiscoveryServerManager::onTerminate()`
`741`	`741`	`entity.second->set_listener(nullptr);`
`742`	`742`
`743`	`743`	`ReturnCode_t ret = entity.second->delete_contained_entities();`
`744`		`- if (ReturnCode_t::RETCODE_OK != ret)`
	`744`	`+ if (RETCODE_OK != ret)`
`745`	`745`	`{`
`746`	`746`	`LOG_ERROR("Error cleaning up server entities");`
`747`	`747`	`}`
`748`	`748`
`749`	`749`	`ret = DomainParticipantFactory::get_instance()->delete_participant(entity.second);`
`750`		`- if (ReturnCode_t::RETCODE_OK != ret)`
	`750`	`+ if (RETCODE_OK != ret)`
`751`	`751`	`{`
`752`	`752`	`LOG_ERROR("Error deleting Server");`
`753`	`753`	`}`
`@@ -824,7 +824,7 @@ void DiscoveryServerManager::loadServer(`
`824`	`824`
`825`	`825`	`// retrieve profile attributes`
`826`	`826`	`DomainParticipantQos dpQOS;`
`827`		`- if (ReturnCode_t::RETCODE_OK !=`
	`827`	`+ if (RETCODE_OK !=`
`828`	`828`	`DomainParticipantFactory::get_instance()->get_participant_qos_from_profile(std::string(profile_name),`
`829`	`829`	`dpQOS))`
`830`	`830`	`{`
`@@ -996,7 +996,7 @@ void DiscoveryServerManager::loadClient(`
`996`	`996`
`997`	`997`	`// retrieve profile attributes`
`998`	`998`	`DomainParticipantQos dpQOS;`
`999`		`- if (ReturnCode_t::RETCODE_OK !=`
	`999`	`+ if (RETCODE_OK !=`
`1000`	`1000`	`DomainParticipantFactory::get_instance()->get_participant_qos_from_profile(std::string(profile_name),`
`1001`	`1001`	`dpQOS))`
`1002`	`1002`	`{`
`@@ -1270,7 +1270,7 @@ void DiscoveryServerManager::loadSimple(`
`1270`	`1270`	`if (profile_name != nullptr)`
`1271`	`1271`	`{`
`1272`	`1272`	`// retrieve profile attributes`
`1273`		`- if (ReturnCode_t::RETCODE_OK !=`
	`1273`	`+ if (RETCODE_OK !=`
`1274`	`1274`	`DomainParticipantFactory::get_instance()->get_participant_qos_from_profile(std::string(profile_name),`
`1275`	`1275`	`dpQOS))`
`1276`	`1276`	`{`
`@@ -1645,7 +1645,7 @@ void DiscoveryServerManager::MapServerInfo(`
`1645`	`1645`	`// I must load the prefix from the profile`
`1646`	`1646`	`// retrieve profile QOS`
`1647`	`1647`	`pqos = std::make_shared<DomainParticipantQos>();`
`1648`		`- if (ReturnCode_t::RETCODE_OK !=`
	`1648`	`+ if (RETCODE_OK !=`
`1649`	`1649`	`DomainParticipantFactory::get_instance()->get_participant_qos_from_profile(profile_name, *pqos))`
`1650`	`1650`	`{`
`1651`	`1651`	`LOG_ERROR("DiscoveryServerManager::loadServer couldn't load profile " << profile_name);`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ void DelayedParticipantDestruction::operator ()(`
`70`	`70`	`std::string name = p->get_qos().name().to_string();`
`71`	`71`
`72`	`72`	`ReturnCode_t ret = manager.deleteParticipant(p);`
`73`		`- if (ReturnCode_t::RETCODE_OK != ret)`
	`73`	`+ if (RETCODE_OK != ret)`
`74`	`74`	`{`
`75`	`75`	`LOG_ERROR("Error during delayed deletion of Participant");`
`76`	`76`	`}`