Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mirrors
SuperElastix
Commits
75380aa9
Commit
75380aa9
authored
Jan 24, 2017
by
Floris Berendsen
Browse files
COMP: mixed up shared and unique pointers
parent
16f0cdfe
Changes
3
Hide whitespace changes
Inline
Side-by-side
Modules/Core/ComponentInterface/include/selxNetworkBuilder.h
View file @
75380aa9
...
...
@@ -113,7 +113,7 @@ protected:
//NetworkBuilder should be constructed with a blueprint.
//Blueprint::ConstPointer 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.
ComponentSelectorContainerType
m_ComponentSelectorContainer
;
...
...
Modules/Core/Filter/include/selxSuperElastixFilterCustomComponents.hxx
View file @
75380aa9
...
...
@@ -35,7 +35,7 @@ namespace selx
::
SuperElastixFilterCustomComponents
(
void
)
:
SuperElastixFilter
(
true
)
{
//RegisterFactoriesByTypeList< ComponentTypeList >::Register();
m_NetworkBuilder
=
std
::
unique
_ptr
<
NetworkBuilder
<
ComponentTypeList
>>
(
new
NetworkBuilder
<
ComponentTypeList
>
()
);
m_NetworkBuilder
=
std
::
make_
unique
<
NetworkBuilder
<
ComponentTypeList
>>
();
}
// end Constructor
}
// namespace elx
...
...
Modules/Core/Filter/src/selxSuperElastixFilter.cxx
View file @
75380aa9
...
...
@@ -37,7 +37,7 @@ SuperElastixFilter
{
// The default constructor registers the default components.
//RegisterFactoriesByTypeList< DefaultComponents >::Register();
m_NetworkBuilder
=
std
::
make_unique
<
NetworkBuilder
<
DefaultComponents
>>
(
new
NetworkBuilder
<
DefaultComponents
>
()
);
m_NetworkBuilder
=
std
::
make_unique
<
NetworkBuilder
<
DefaultComponents
>>
();
}
// end Constructor
//
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment