Commit 75380aa9 authored by Floris Berendsen's avatar Floris Berendsen
Browse files

COMP: mixed up shared and unique pointers

parent 16f0cdfe
...@@ -113,7 +113,7 @@ protected: ...@@ -113,7 +113,7 @@ protected:
//NetworkBuilder should be constructed with a blueprint. //NetworkBuilder should be constructed with a blueprint.
//Blueprint::ConstPointer m_Blueprint; //Blueprint::ConstPointer m_Blueprint;
//Blueprint const * m_Blueprint; //Blueprint const * m_Blueprint;
std::shared_ptr< const Blueprint > m_Blueprint; std::shared_ptr< Blueprint > m_Blueprint;
// A selector for each node, that each can hold multiple instantiated components. Ultimately is should be 1 component each. // A selector for each node, that each can hold multiple instantiated components. Ultimately is should be 1 component each.
ComponentSelectorContainerType m_ComponentSelectorContainer; ComponentSelectorContainerType m_ComponentSelectorContainer;
......
...@@ -35,7 +35,7 @@ namespace selx ...@@ -35,7 +35,7 @@ namespace selx
::SuperElastixFilterCustomComponents(void) : SuperElastixFilter(true) ::SuperElastixFilterCustomComponents(void) : SuperElastixFilter(true)
{ {
//RegisterFactoriesByTypeList< ComponentTypeList >::Register(); //RegisterFactoriesByTypeList< ComponentTypeList >::Register();
m_NetworkBuilder = std::unique_ptr<NetworkBuilder<ComponentTypeList>>(new NetworkBuilder<ComponentTypeList>()); m_NetworkBuilder = std::make_unique<NetworkBuilder<ComponentTypeList>>();
} // end Constructor } // end Constructor
} // namespace elx } // namespace elx
......
...@@ -37,7 +37,7 @@ SuperElastixFilter ...@@ -37,7 +37,7 @@ SuperElastixFilter
{ {
// The default constructor registers the default components. // The default constructor registers the default components.
//RegisterFactoriesByTypeList< DefaultComponents >::Register(); //RegisterFactoriesByTypeList< DefaultComponents >::Register();
m_NetworkBuilder = std::make_unique<NetworkBuilder<DefaultComponents>>(new NetworkBuilder<DefaultComponents>()); m_NetworkBuilder = std::make_unique<NetworkBuilder<DefaultComponents>>();
} // end Constructor } // end Constructor
// //
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment