Skip to content
Snippets Groups Projects
Commit 0bf7f2a2 authored by Sreekanth Arikatla's avatar Sreekanth Arikatla
Browse files

Merge branch 'fixGccErrors' into 'master'

COMP: Fix compilation errors on gcc

See merge request iMSTK/iMSTK!451
parents 0f9319fc 32f90f61
No related branches found
No related tags found
No related merge requests found
......@@ -24,6 +24,7 @@
#include <iostream>
#include <atomic>
#include <functional>
#include <memory>
namespace imstk
{
......
......@@ -23,7 +23,7 @@
#include "imstkMath.h"
#include <tbb\concurrent_unordered_set.h>
#include <tbb/concurrent_unordered_set.h>
namespace imstk
{
......
......@@ -24,6 +24,7 @@
#include <unordered_map>
#include <thread>
#include <atomic>
#include <vector>
namespace imstk
{
......
......@@ -22,6 +22,7 @@
#pragma once
#include <chrono>
#include <memory>
#include "imstkInteractorStyle.h"
......
......@@ -167,6 +167,12 @@ SimulationManager::createNewScene(const std::string& newSceneName, std::shared_p
return newScene;
}
std::shared_ptr<Scene>
SimulationManager::createNewScene(const std::string& newSceneName)
{
return this->createNewScene(newSceneName, std::make_shared<SceneConfig>());
}
std::shared_ptr<Scene>
SimulationManager::createNewScene()
{
......@@ -179,7 +185,7 @@ SimulationManager::createNewScene()
std::string newSceneName = "Scene_" + std::to_string(id);
return this->createNewScene(newSceneName);
return this->createNewScene(newSceneName, std::make_shared<SceneConfig>());
}
void
......
......@@ -160,7 +160,8 @@ public:
/// \brief Create a new scene with a given name
///
std::shared_ptr<Scene> createNewScene(const std::string& newSceneName,
std::shared_ptr<SceneConfig> config = std::make_shared<SceneConfig>());
std::shared_ptr<SceneConfig> config);
std::shared_ptr<Scene> createNewScene(const std::string& newSceneName);
///
/// \brief Create a new scene
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment