- new multiple input selector

[clitk.git] / common / clitkCommon.h

diff --git a/common/clitkCommon.h b/common/clitkCommon.h
index 5831d7b8ec08b514dd59e5ae2a8e8e09b3afa294..3a12a001bad6d1c7ee80ed75cab83d40ebff0095 100644 (file)
--- a/common/clitkCommon.h
+++ b/common/clitkCommon.h
@@ -11,29 +11,18 @@
 
    -------------------------------------------------------------------*/
 
-// std include
-#include <config.h>
-#include <cstdlib>
-#include <algorithm>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <vector>
-#include <math.h>
-#include <typeinfo>
-
-#include "itkMacro.h"
+// clitk include
+#include "clitkPortability.h"
+
+// itk include (include std)
 #include <itkContinuousIndex.h>
+#include <itkMacro.h>
 #include <itkImageRegionConstIterator.h>
 #include <itkImageRegionIterator.h>
 
 //--------------------------------------------------------------------
 namespace clitk {
-  
-#if defined(WIN32)
-#define lrint(x) (floor(x+(x>0) ? 0.5 : -0.5))
-#endif
-  
+
   typedef unsigned char uchar;
   typedef unsigned short ushort;
   typedef unsigned int uint;
@@ -50,25 +39,13 @@ namespace clitk {
   
   //--------------------------------------------------------------------
   // GGO with modified struct name
-#define GGO(ggo_filename, args_info)                                             \
-  gengetopt_args_info_##ggo_filename args_info;                                        \
-    cmdline_parser2(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);
-  
-
-  /*   //--------------------------------------------------------------------
-  // GGO default
 #define GGO(ggo_filename, args_info)                                    \
-  gengetopt_args_info_##ggo_filename args_info;                         \
+  args_info_##ggo_filename args_info;                                  \
   cmdline_parser2(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);
-  
- //--------------------------------------------------------------------
- */
+  else cmdline_parser(argc, argv, &args_info);  
+
   //--------------------------------------------------------------------
   // skip line with #
   void skipComment(std::istream & is);