More MSVC stuff

[clitk.git] / common / clitkCommon.h

diff --git a/common/clitkCommon.h b/common/clitkCommon.h
index ce70757a5496a74d2df199c7197879d34cb84e35..c4d772d97aab121258d2a8c33eaf6fa77b444952 100644 (file)
--- a/common/clitkCommon.h
+++ b/common/clitkCommon.h
@@ -11,29 +11,32 @@
 
    -------------------------------------------------------------------*/
 
+// clitk include
+#include "clitkPortability.h"
+
 // 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"
+//#include <config.h>
+//#include <cstdlib>
+//#include <algorithm>
+//#include <iostream>
+//#include <string>
+//#include <fstream>
+//#include <sstream>
+//#include <vector>
+//#include <math.h>
+//#include <typeinfo>
+//#include <utility>
+//#include <algorithm>
+
+// 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;