Commit 7eda479c authored by Kasper Marstal's avatar Kasper Marstal
Browse files

Merge branch 'develop' into SELX-Refactor-Modules-Cmake-System

parents 62478e70 79ab1209
......@@ -89,7 +89,7 @@ protected:
typedef ComponentBase::CriterionType CriterionType;
typedef ComponentBase::ParameterValueType ParameterValueType;
typedef typename ComponentSelector<ComponentList> ComponentSelectorType;
typedef ComponentSelector<ComponentList> ComponentSelectorType;
typedef typename ComponentSelectorType::Pointer ComponentSelectorPointer;
typedef std::map< ComponentNameType, ComponentSelectorPointer > ComponentSelectorContainerType;
......
......@@ -33,8 +33,8 @@ namespace selx
SuperElastixFilterCustomComponents<ComponentTypeList>
::SuperElastixFilterCustomComponents(void) : SuperElastixFilter(true)
{
//RegisterFactoriesByTypeList< ComponentTypeList >::Register();
m_NetworkBuilder = std::make_unique<NetworkBuilder<ComponentTypeList>>();
//std::make_unique<NetworkBuilder<ComponentTypeList>>();
m_NetworkBuilder = std::unique_ptr<NetworkBuilder<ComponentTypeList>>(new NetworkBuilder<ComponentTypeList>);
} // end Constructor
} // namespace elx
......
......@@ -34,8 +34,8 @@ SuperElastixFilter
::SuperElastixFilter(void) : SuperElastixFilter(true)
{
// The default constructor registers the default components.
//RegisterFactoriesByTypeList< DefaultComponents >::Register();
m_NetworkBuilder = std::make_unique<NetworkBuilder<DefaultComponents>>();
//std::make_unique<NetworkBuilder<DefaultComponents>>();
m_NetworkBuilder = std::unique_ptr<NetworkBuilder<DefaultComponents>>(new NetworkBuilder<DefaultComponents>);
} // end Constructor
//
......
Markdown is supported
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