Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove RenderEngineManager's inheritance from Singleton base class #874

Merged
merged 2 commits into from
Jul 26, 2023
Merged

Remove RenderEngineManager's inheritance from Singleton base class #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0171af2
Remove inheritance from singleton class
iche033 Jul 25, 2023
4619316
Merge branch 'main' into renderenginemgr_singleton
iche033 Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions include/gz/rendering/RenderEngineManager.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion src/RenderEngineManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

//////////////////////////////////////////////////
Expand Down