STYLE: Move elxInstallComponentFunction macro defines from "elxMacro.h"

...to "elxInstallAllComponents.h". "elxInstallAllComponents.h" is the only source file that needs to have those macro's.
SuperElastix · Oct 28, 2021 · 7694040 · 7694040
1 parent f5a573d
commit 7694040
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 41 deletions.
diff --git a/Core/Install/elxInstallAllComponents.h b/Core/Install/elxInstallAllComponents.h
@@ -21,8 +21,43 @@
 
 #include "elxComponentDatabase.h"
 
-/** The CMake generated files contain macros: */
-#include "elxMacro.h"
+// The CMake generated "elxInstallComponentFunction*.h" files contain calls to the following macros:
+
+/**
+ * elxInstallComponentFunctionDeclarationMacro
+ *
+ * Usage example:
+ *   elxInstallComponentFunctionDeclarationMacro( BSplineTransform );
+ *
+ * This macro declares the function implemented by
+ * the elxInstallMacro. This macro is used by the
+ * CMake generated file
+ * elxInstallComponentFunctionDeclarations.h
+ * only.
+ *
+ * Details: the declaration of InstallComponent function defined
+ * by elxInstallMacro is simply repeated.
+ */
+#define elxInstallComponentFunctionDeclarationMacro(_classname)                                                        \
+  extern "C" int _classname##InstallComponent(::elastix::ComponentDatabase * _cdb)
+
+/**
+ * elxInstallComponentFunctionCallMacro
+ *
+ * Usage example:
+ *   elxInstallComponentFunctionCallMacro( BSplineTransform );
+ *
+ * This macro calls the function implemented by
+ * the elxInstallMacro. This macro is used by the
+ * CMake generated file
+ * elxInstallComponentFunctionCalls.h
+ * only.
+ *
+ * Details: the InstallComponent function defined
+ * by elxInstallMacro is called.
+ */
+#define elxInstallComponentFunctionCallMacro(_classname) ret |= _classname##InstallComponent(_cdb)
+
 
 /** The following file, generated by CMake, declares all
  * the InstallComponent functions implemented by the components. */

diff --git a/Core/Install/elxMacro.h b/Core/Install/elxMacro.h
@@ -129,45 +129,6 @@
     return _InstallDummy##_classname;                                                                                  \
   } // ignore semicolon
 
-/**
- * elxInstallComponentFunctionDeclarationMacro
- *
- * Usage example:
- *   elxInstallComponentFunctionDeclarationMacro( BSplineTransform );
- *
- * This macro declares the function implemented by
- * the elxInstallMacro. This macro is used by the
- * CMake generated file
- * elxInstallComponentFunctionDeclarations.h
- * only.
- *
- * Details: the declaration of InstallComponent function defined
- * by elxInstallMacro is simply repeated.
- *
- * See also elxInstallAllComponents.h.
- */
-#define elxInstallComponentFunctionDeclarationMacro(_classname)                                                        \
-  extern "C" int _classname##InstallComponent(::elastix::ComponentDatabase * _cdb)
-
-/**
- * elxInstallComponentFunctionCallMacro
- *
- * Usage example:
- *   elxInstallComponentFunctionCallMacro( BSplineTransform );
- *
- * This macro calls the function implemented by
- * the elxInstallMacro. This macro is used by the
- * CMake generated file
- * elxInstallComponentFunctionCalls.h
- * only.
- *
- * Details: the InstallComponent function defined
- * by elxInstallMacro is called.
- *
- * See also elxInstallAllComponents.h.
- */
-#define elxInstallComponentFunctionCallMacro(_classname) ret |= _classname##InstallComponent(_cdb)
-
 
 /**
  * elxClassNameMacro(_name)