X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkCommon.h;h=8cd82fbe0b0bc1b20f38876368f0d6348615b1a9;hb=d7f456d86ca398a89ccf9de43ab68a2b50b8ca1f;hp=51258e66fc3abd5c418dfc480bdba43debd32442;hpb=0451c66d4a069d04db99c9d719e053c6019923d8;p=clitk.git

diff --git a/common/clitkCommon.h b/common/clitkCommon.h
index 51258e6..8cd82fb 100644
--- a/common/clitkCommon.h
+++ b/common/clitkCommon.h
@@ -38,8 +38,9 @@
 #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
 
 //--------------------------------------------------------------------
@@ -227,6 +228,18 @@ namespace clitk {
   //--------------------------------------------------------------------
   void PrintMemoryUsed();
 
+  //--------------------------------------------------------------------
+  // Convert a map to a vector
+  template <typename M, typename V> 
+  void MapToVecFirst(const M & m, V & v);
+  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