X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkCommon.h;h=2f5b26f1173b3e5e94999816031695c13cb2afc4;hb=97a3a9ed3f33ab0316bd4613c8aae404de40dad1;hp=11a6255955e8b2185c25b49334bd64158d58a8dc;hpb=1561fae3bf0756ba34e222cd1f189aac0087c62a;p=clitk.git

diff --git a/common/clitkCommon.h b/common/clitkCommon.h
index 11a6255..2f5b26f 100644
--- 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