Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

[clitk.git] / common / clitkCommon.h

diff --git a/common/clitkCommon.h b/common/clitkCommon.h
index 11a6255955e8b2185c25b49334bd64158d58a8dc..2f5b26f1173b3e5e94999816031695c13cb2afc4 100644 (file)
--- a/common/clitkCommon.h
+++ b/common/clitkCommon.h
@@ -38,16 +38,12 @@
 #if defined(unix) || defined(__APPLE__)
 #  include <sys/time.h>
 #  include <sys/resource.h>
-#elif defined(WIN32)
+#elif defined(_WIN32)
 #  include <windows.h>
+#  include <stdint.h>
 #endif
 
-#if ITK_VERSION_MAJOR < 4
-namespace itk
-{
-  typedef unsigned int ThreadIdType;
-}
-#endif
+#define VTK_EXCLUDE_STRSTREAM_HEADERS
 
 //--------------------------------------------------------------------
 namespace clitk {
@@ -241,6 +237,11 @@ namespace clitk {
   template <typename M, typename V> 
   void MapToVecSecond(const M & m, V & v);
 
+  //--------------------------------------------------------------------
+  // Find/replace string
+  template<class T>
+  int inline findAndReplace(T& source, const T& find, const T& replace);
+
 #include "clitkCommon.txx"
 
 } // end namespace