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

Merge branch 'fix_compile_error' into 'master'

Fix init of atomic<bool>; fix function sigature of RigidBodyDynamicsExample

See merge request iMSTK/iMSTK!411
parents 896c05d2 ec31ad0b
No related branches found
No related tags found
No related merge requests found
......@@ -33,7 +33,7 @@
using namespace imstk;
std::shared_ptr<imstk::RigidObject>
addMeshRigidObject(std::string& name, std::shared_ptr<Scene> scene, Vec3d pos)
addMeshRigidObject(const std::string& name, std::shared_ptr<Scene> scene, Vec3d pos)
{
// create cube object
auto meshObj = std::make_shared<RigidObject>(name);
......
......@@ -231,6 +231,6 @@ protected:
bool m_isInitialized = false;
std::atomic<bool> m_resetRequested = false;
std::atomic<bool> m_resetRequested = ATOMIC_VAR_INIT(false);
};
} // imstk
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