COMP: SuperElastix/SuperElastix#24 compiles

Modules/Components/Niftyreg/test/selxNiftyregComponentTest.cxx

@@ -19,6 +19,7 @@
 
 #include "selxSuperElastixFilter.h"
 #include "selxRegisterComponentFactoriesByTypeList.h"
+#include "selxDefaultComponents.h"
 #include "selxRegistrationController.h"
 
 #include "selxNiftyregReadImageComponent.h"

Modules/Core/ComponentRegistration/include/selxRegisterComponentFactoriesByTypeList.h

@@ -17,11 +17,12 @@
 *
 *=========================================================================*/
 
-#include "selxTypeList.h"
-
 #ifndef RegisterByTypeList_h
 #define RegisterByTypeList_h
 
+#include "selxTypeList.h"
+#include "selxComponentFactory.h"
+
 namespace selx
 {
 template< typename >

Modules/Core/Filter/src/selxSuperElastixFilter.cxx

@@ -75,7 +75,7 @@ SuperElastixFilter
       itkExceptionMacro(<< "Setting a Blueprint is required first.")
     }
 
-    this->m_NetworkBuilder = NetworkBuilderPointer(new NetworkBuilder(this->m_Blueprint->Get()));
+    this->m_NetworkBuilder = std::unique_ptr< NetworkBuilder >(new NetworkBuilder(this->m_Blueprint->Get()));
     this->m_AllUniqueComponents = this->m_NetworkBuilder->Configure();
   }
   else if (this->m_BlueprintConnectionModified == true)
@@ -211,7 +211,7 @@ SuperElastixFilter
     {
       itkExceptionMacro(<< "Setting a Blueprint is required first.")
     }
-    this->m_NetworkBuilder = NetworkBuilderPointer(new NetworkBuilder(this->m_Blueprint->Get()));
+    this->m_NetworkBuilder = std::unique_ptr< NetworkBuilder >(new NetworkBuilder(this->m_Blueprint->Get()));
     this->m_AllUniqueComponents = this->m_NetworkBuilder->Configure();
   }
   if (!this->m_AllUniqueComponents)
@@ -235,7 +235,7 @@ SuperElastixFilter
       itkExceptionMacro(<< "Setting a Blueprint is required first.")
     }
 
-    this->m_NetworkBuilder = NetworkBuilderPointer(new NetworkBuilder(this->m_Blueprint->Get()));
+    this->m_NetworkBuilder = std::unique_ptr< NetworkBuilder >(new NetworkBuilder(this->m_Blueprint->Get()));
     this->m_AllUniqueComponents = this->m_NetworkBuilder->Configure();
   }
   if (!this->m_AllUniqueComponents)
@@ -274,7 +274,7 @@ SuperElastixFilter::OutputDataType
         itkExceptionMacro(<< "Setting a Blueprint is required first.")
       }
 
-      this->m_NetworkBuilder = NetworkBuilderPointer(new NetworkBuilder(this->m_Blueprint->Get()));
+      this->m_NetworkBuilder = std::unique_ptr< NetworkBuilder >(new NetworkBuilder(this->m_Blueprint->Get()));
       this->m_AllUniqueComponents = this->m_NetworkBuilder->Configure();
       this->m_BlueprintConnectionModified = false;
     }