Rename method in ECMSingleton

robotology-legacy · Mar 19, 2020 · 99fcbc0 · 99fcbc0
1 parent 2bf7223
commit 99fcbc0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/cpp/scenario/plugins/ECMProvider/ECMProvider.cpp b/cpp/scenario/plugins/ECMProvider/ECMProvider.cpp
@@ -57,16 +57,17 @@ void ECMProvider::Configure(const ignition::gazebo::Entity& entity,
                             ignition::gazebo::EntityComponentManager& ecm,
                             ignition::gazebo::EventManager& eventMgr)
 {
-    if (ECMSingleton::get().valid()) {
-        gymppWarning << "The ECM singleton has been already configured" << std::endl;
+    if (ECMSingleton::Instance().valid()) {
+        gymppWarning << "The ECM singleton has been already configured"
+                     << std::endl;
         return;
     }
 
     gymppDebug << "Storing ECM resources in the singleton" << std::endl;
 
-    if (!ECMSingleton::get().storePtrs(&ecm, &eventMgr)) {
-        gymppError << "Failed to store ECM in the singleton for entity [" << entity << "]"
-                   << std::endl;
+    if (!ECMSingleton::Instance().storePtrs(&ecm, &eventMgr)) {
+        gymppError << "Failed to store ECM in the singleton for entity ["
+                   << entity << "]" << std::endl;
         return;
     }
 }

diff --git a/cpp/scenario/plugins/ECMProvider/ECMSingleton.cpp b/cpp/scenario/plugins/ECMProvider/ECMSingleton.cpp
@@ -43,7 +43,7 @@ ECMSingleton::ECMSingleton()
     : pImpl{new Impl()}
 {}
 
-ECMSingleton& ECMSingleton::get()
+ECMSingleton& ECMSingleton::Instance()
 {
     static ECMSingleton instance;
     return instance;

diff --git a/cpp/scenario/plugins/ECMProvider/include/scenario/plugins/gazebo/ECMSingleton.h b/cpp/scenario/plugins/ECMProvider/include/scenario/plugins/gazebo/ECMSingleton.h
@@ -50,7 +50,7 @@ class scenario::plugins::gazebo::ECMSingleton
     ECMSingleton(ECMSingleton&) = delete;
     void operator=(const ECMSingleton&) = delete;
 
-    static ECMSingleton& get();
+    static ECMSingleton& Instance();
 
     void clean();
     bool valid() const;