BUGs CPACK + BUGs CreatePackage CreateBlackBox windows

[bbtk.git] / kernel / src / bbtkUtilities.h

diff --git a/kernel/src/bbtkUtilities.h b/kernel/src/bbtkUtilities.h
index 8711393d233f267a2645ae01051ec1bddf8f92bb..2b1b031559faf77899ab4c1d41a2bca122a815f2 100644 (file)
--- a/kernel/src/bbtkUtilities.h
+++ b/kernel/src/bbtkUtilities.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkUtilities.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/08 14:58:31 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2008/03/10 06:24:13 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -128,7 +128,8 @@ namespace bbtk
        // WIN 32 mechanism
        // shared lib name = <name>.dll
 
-     // remove {bb} if any
+// EED Problem loading package call bbtkTools
+//     // remove {bb} if any
     if (memcmp (pkgname.c_str(), "bb", 2) == 0) {
        pkgname =  pkgname.substr(2, pkgname.length());  
     }
@@ -516,15 +517,14 @@ static int Explore(std::string const &dirpath, bool recursive, std::vector<std::
   //========================================================================
 
     static inline void replace( std::string& str,
-                                const std::string& from, 
-                                const std::string& to )
+                                const std::string& what, 
+                                const std::string& with )
     {
-      using std::string;
-      string::size_type pos = str.find( from );
-      while ( pos != string::npos )
+      std::string::size_type pos = str.find( what );
+         while ( pos != std::string::npos )
       {
-        str.replace( pos, from.size(), to );
-        pos = str.find( from, pos+from.size()-1 );
+        str.replace( pos, what.size(), with );
+        pos = str.find( what, pos+what.size()-1 );
       } 
     }
     //========================================================================