cosmetic

[clitk.git] / common / clitkCommon.h

diff --git a/common/clitkCommon.h b/common/clitkCommon.h
index f36894652b45a002d61103b677c72cd4e69b613a..e3145b1d840425812feef4f2a6f4773c7073b90e 100644 (file)
--- a/common/clitkCommon.h
+++ b/common/clitkCommon.h
@@ -20,8 +20,9 @@
 #define CLITKCOMMON_H
 
 // clitk include
-#include "clitkConfiguration.h"
 #include "clitkPortability.h"
+#include "clitkDD.h"
+#include "clitkExceptionObject.h"
 
 // itk include (include std)
 #include <itkContinuousIndex.h>
@@ -29,6 +30,8 @@
 #include <itkImageRegionConstIterator.h>
 #include <itkImageRegionIterator.h>
 
+#include <fstream>
+
 //--------------------------------------------------------------------
 namespace clitk {
 
@@ -36,11 +39,6 @@ namespace clitk {
   typedef unsigned short ushort;
   typedef unsigned int uint;
 
-  //--------------------------------------------------------------------
-  // display 
-#define DD(a) std::cout << #a " = [ " << a << " ]" << std::endl;
-#define DDV(a,n) { std::cout << #a " = [ "; for(unsigned int _i_=0; _i_<n; _i_++) { std::cout << a[_i_] << " "; }; std::cout << " ]" << std::endl;}
-
   //--------------------------------------------------------------------
   // when everything goes wrong
 #define WHEREAMI "[ " << __FILE__  << " ] line " << __LINE__
@@ -50,10 +48,10 @@ namespace clitk {
   // GGO with modified struct name
 #define GGO(ggo_filename, args_info)                                    \
   args_info_##ggo_filename args_info;                                  \
-  cmdline_parser2(argc, argv, &args_info, 1, 1, 0);                    \
+  cmdline_parser_##ggo_filename##2(argc, argv, &args_info, 1, 1, 0);                   \
   if (args_info.config_given)                                          \
-    cmdline_parser_configfile (args_info.config_arg, &args_info, 0, 0, 1); \
-  else cmdline_parser(argc, argv, &args_info);  
+    cmdline_parser_##ggo_filename##_configfile (args_info.config_arg, &args_info, 0, 0, 1); \
+  else cmdline_parser_##ggo_filename(argc, argv, &args_info);  
 
   //--------------------------------------------------------------------
   // skip line with #