Merge branch 'ELASTIX-44-Unite-Interface-framework-with-Factory-framework' of...

Merge branch 'ELASTIX-44-Unite-Interface-framework-with-Factory-framework' of https://github.com/kaspermarstal/SuperElastix into ELASTIX-44-Unite-Interface-framework-with-Factory-framework

Modules/Core/ComponentInterface/include/ComponentBase.h

@@ -9,6 +9,7 @@
 #include <iostream>
 #include <fstream>
 #include <string>
+#include <cstring>
 #include <map>
 
 namespace selx

Modules/Core/ComponentInterface/include/ComponentFactory.hxx

@@ -19,7 +19,7 @@
 //#include "itkMetricComponent1.h"
 #include "itkVersion.h"
 //#include "ComponentTraits.h"
-#include <typeinfo.h>
+#include <typeinfo>
 namespace selx
 {
 

Modules/Core/ComponentInterface/include/InterfaceTraits.h

@@ -12,7 +12,7 @@ struct InterfaceName
 {
   static const char* Get()
   {
-    static_assert(false, "Please implement a template specialization for the appropriate InterfaceName")
+    //static_assert(false, "Please implement a template specialization for the appropriate InterfaceName");
     return typeid(T).name();
   }
 };

Modules/Core/ComponentInterface/include/Interfaces.h

@@ -3,6 +3,7 @@
 
 #include "ComponentBase.h"
 #include <typeinfo>
+#include <string>
 
 namespace selx
 {

Modules/Core/ComponentInterface/include/Interfaces.hxx

@@ -48,7 +48,7 @@ template<typename FirstInterface, typename ... RestInterfaces>
 ComponentBase::interfaceStatus Accepting<FirstInterface, RestInterfaces... >::ConnectFromImpl(const char * interfacename, ComponentBase* other)
 {
   // does our component have an accepting interface called interfacename? 
-  if (0 ==std::strcmp(InterfaceName<InterfaceAcceptor<FirstInterface>>::Get(), interfacename))
+  if (0 ==strcmp(InterfaceName<InterfaceAcceptor<FirstInterface>>::Get(), interfacename))
   {
     // cast always succeeds since we know via the template arguments of the component which InterfaceAcceptors its base classes are.
     InterfaceAcceptor<FirstInterface>* acceptIF = this;
@@ -82,7 +82,7 @@ int Accepting<FirstInterface, RestInterfaces... >::ConnectFromImpl(ComponentBase
 template<typename FirstInterface, typename ... RestInterfaces>
 bool Accepting<FirstInterface, RestInterfaces... >::HasInterface(const char* interfacename)
 {
-  if (0 == std::strcmp(InterfaceName<InterfaceAcceptor<FirstInterface>>::Get(), interfacename))
+  if (0 == strcmp(InterfaceName<InterfaceAcceptor<FirstInterface>>::Get(), interfacename))
   {
     return true;
   }
@@ -92,7 +92,7 @@ bool Accepting<FirstInterface, RestInterfaces... >::HasInterface(const char* int
 template<typename FirstInterface, typename ... RestInterfaces>
 bool Providing<FirstInterface, RestInterfaces... >::HasInterface(const char* interfacename)
 {
-  if (0 == std::strcmp(InterfaceName<FirstInterface>::Get(), interfacename))
+  if (0 == strcmp(InterfaceName<FirstInterface>::Get(), interfacename))
   {
     return true;
   }

Modules/Core/ModuleCore.cmake

 set( MODULE ModuleCore )
 
-# Module source files
-set( ${MODULE}_SOURCE_FILES
-  ${${MODULE}_SOURCE_DIR}/Blueprints/src/elxBlueprint.cxx
-)
-
 # Export include files
 set( ${MODULE}_INCLUDE_DIRS
   ${${MODULE}_SOURCE_DIR}/Common/include