Commit 79ab1209 authored by Floris Berendsen's avatar Floris Berendsen
Browse files

COMP: removed make_unique (for proper C++ 11)

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