Merge branch 'main' into image_pimpl

gazebosim · Jul 26, 2023 · dd68f85 · dd68f85
2 parents c21aa42 + c96cefd
commit dd68f85
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/include/gz/rendering/RenderEngineManager.hh b/include/gz/rendering/RenderEngineManager.hh
@@ -43,8 +43,7 @@ namespace gz
     /// render-engines available at runtime. RenderEngine objects should not
     /// be access directly, but instead via the RenderEngineManager to maintain
     /// a flexible render-engine agnostic design.
-    class GZ_RENDERING_VISIBLE RenderEngineManager :
-      public virtual common::SingletonT<RenderEngineManager>
+    class GZ_RENDERING_VISIBLE RenderEngineManager
     {
       /// \brief Constructor
       public: RenderEngineManager();
@@ -136,7 +135,6 @@ namespace gz
       public: void SetPluginPaths(const std::list<std::string> &_paths);
 
       /// \brief Get a pointer to the render engine manager
-      /// \todo(anyone) Remove inheritance from Singleton base class
       /// \return a pointer to the render engine manager
       public: static RenderEngineManager *Instance();
 

diff --git a/src/RenderEngineManager.cc b/src/RenderEngineManager.cc
@@ -386,7 +386,7 @@ void RenderEngineManager::SetPluginPaths(const std::list<std::string> &_paths)
 //////////////////////////////////////////////////
 RenderEngineManager *RenderEngineManager::Instance()
 {
-  return SingletonT<RenderEngineManager>::Instance();
+  return gz::common::SingletonT<RenderEngineManager>::Instance();
 }
 
 //////////////////////////////////////////////////