No comments

diff --git a/src/WOKTools/WOKTools_DataMap.gxx b/src/WOKTools/WOKTools_DataMap.gxx
index a7dd93ccdde9245dde4deaf1a300abe2b091aa00..6331971f10a3e3082590ad1f4eb4311dee9e1bd0 100755 (executable)
--- a/src/WOKTools/WOKTools_DataMap.gxx
+++ b/src/WOKTools/WOKTools_DataMap.gxx
@@ -17,8 +17,10 @@ template <class Item, class Key> class DataMapNode  : public WOKTools_MapNode {
       WOKTools_MapNode(n), key(K), hashcode(ahascode) { value = I; }
   void* operator new(size_t aSize) 
     {return Standard::Allocate(aSize);}
-  void  operator delete(void* aNode, size_t aSize) {
-    Standard::Free(aNode,aSize);
+//  void  operator delete(void* aNode, size_t aSize) {
+  void  operator delete(void* aNode) {
+//    Standard::Free(aNode,aSize);
+    Standard::Free(aNode);
   }
 
   Key           key;
@@ -36,8 +38,10 @@ class Node  : public WOKTools_MapNode {
       WOKTools_MapNode(n), key(K), hashcode(ahascode) { value = I; }
   void* operator new(size_t aSize) 
     {return Standard::Allocate(aSize);}
-  void  operator delete(void* aNode, size_t aSize) {
-    Standard::Free(aNode,aSize);
+//  void  operator delete(void* aNode, size_t aSize) {
+  void  operator delete(void* aNode) {
+//    Standard::Free(aNode,aSize);
+    Standard::Free(aNode);
   }
 
   TheKey           key;

diff --git a/src/WOKTools/WOKTools_IndexedDataMap.gxx b/src/WOKTools/WOKTools_IndexedDataMap.gxx
index fd7e0c0b75fd75ee337d52cd7aa143f46f7e81e1..c027a30379c4961615f01601bd567b2c2be01f2a 100755 (executable)
--- a/src/WOKTools/WOKTools_IndexedDataMap.gxx
+++ b/src/WOKTools/WOKTools_IndexedDataMap.gxx
@@ -21,8 +21,10 @@ template <class Key, class Item> class IndexedDataMapNode : public WOKTools_MapN
   void* operator new(size_t aSize) {
     return Standard::Allocate(aSize);
   }
-  void  operator delete(void* aNode, size_t aSize) {
-    Standard::Free(aNode,aSize);
+//  void  operator delete(void* aNode, size_t aSize) {
+  void  operator delete(void* aNode) {
+//    Standard::Free(aNode,aSize);
+    Standard::Free(aNode);
   }
 
   Key                 key;
@@ -44,8 +46,10 @@ class Node : public WOKTools_MapNode {
   void* operator new(size_t aSize) {
     return Standard::Allocate(aSize);
   }
-  void  operator delete(void* aNode, size_t aSize) {
-    Standard::Free(aNode,aSize);
+//  void  operator delete(void* aNode, size_t aSize) {
+  void  operator delete(void* aNode) {
+//    Standard::Free(aNode,aSize);
+    Standard::Free(aNode);
   }
 
   TheKey                key;

diff --git a/src/WOKTools/WOKTools_IndexedMap.gxx b/src/WOKTools/WOKTools_IndexedMap.gxx
index 303000afcefeb71a1e9bdc19ea4a3a111e8abe8c..2a2a2a942e9652c561d4b2e58faf519b92a0647f 100755 (executable)
--- a/src/WOKTools/WOKTools_IndexedMap.gxx
+++ b/src/WOKTools/WOKTools_IndexedMap.gxx
@@ -19,8 +19,10 @@ template <class Key> class IndexedMapNode : public WOKTools_MapNode {
   void* operator new(size_t aSize) {
     return Standard::Allocate(aSize);
   }
-  void  operator delete(void* aNode, size_t aSize) {
-    Standard::Free(aNode,aSize);
+//  void  operator delete(void* aNode, size_t aSize) {
+  void  operator delete(void* aNode) {
+//    Standard::Free(aNode,aSize);
+    Standard::Free(aNode);
   }
 
   Key                key;
@@ -41,8 +43,10 @@ class Node : public WOKTools_MapNode {
   void* operator new(size_t aSize) {
     return Standard::Allocate(aSize);
   }
-  void  operator delete(void* aNode, size_t aSize) {
-    Standard::Free(aNode,aSize);
+//  void  operator delete(void* aNode, size_t aSize) {
+  void  operator delete(void* aNode) {
+//    Standard::Free(aNode,aSize);
+    Standard::Free(aNode);
   }
   
   TheKey             key;

diff --git a/src/WOKTools/WOKTools_Map.gxx b/src/WOKTools/WOKTools_Map.gxx
index cf80cf99f345149c2b7a1c2c1feec3681963fa84..9dcd2d7cfaa3e6543504ff5d1990ad7345a138bf 100755 (executable)
--- a/src/WOKTools/WOKTools_Map.gxx
+++ b/src/WOKTools/WOKTools_Map.gxx
@@ -16,8 +16,10 @@ template <class TheKey> class MapNode : public WOKTools_MapNode {
     MapNode(const TheKey& K, const Standard_Integer ahascode, MapNode* n) : WOKTools_MapNode(n),key(K), hashcode(ahascode) {}
   void* operator new(size_t aSize) 
     {return Standard::Allocate(aSize);}
-  void  operator delete(void* aNode, size_t aSize) {
-    Standard::Free(aNode,aSize);
+//  void  operator delete(void* aNode, size_t aSize) {
+  void  operator delete(void* aNode) {
+//    Standard::Free(aNode,aSize);
+    Standard::Free(aNode);
   }
   TheKey   key;
   Standard_Integer hashcode;
@@ -32,8 +34,10 @@ class Node : public WOKTools_MapNode {
     Node(const TheKey& K, const Standard_Integer ahascode, Node* n) : WOKTools_MapNode(n),key(K), hashcode(ahascode) {}
   void* operator new(size_t aSize) 
     {return Standard::Allocate(aSize);}
-  void  operator delete(void* aNode, size_t aSize) {
-    Standard::Free(aNode,aSize);
+//  void  operator delete(void* aNode, size_t aSize) {
+  void  operator delete(void* aNode) {
+//    Standard::Free(aNode,aSize);
+    Standard::Free(aNode);
   }
   TheKey   key;
   Standard_Integer hashcode;

diff --git a/src/WOKTools/WOKTools_Replace.tcl b/src/WOKTools/WOKTools_Replace.tcl
index 39fd7acf60122e0e95da857a6f35e08af8eec12a..4fb6b0cb138190b629e12436c01082dd28c9a4b0 100755 (executable)
--- a/src/WOKTools/WOKTools_Replace.tcl
+++ b/src/WOKTools/WOKTools_Replace.tcl
@@ -1,15 +1,15 @@
 
 
-proc WOKTools_Replace::AdmFileType {} {
+proc WOKTools_Replace:AdmFileType {} {
     return "dbadmfile";
 }
 
-proc WOKTools_Replace::OutputDirTypeName {} {
+proc WOKTools_Replace:OutputDirTypeName {} {
     return "dbtmpfile";
 }
 
 
-proc WOKTools_Replace::HandleInputFile { ID } { 
+proc WOKTools_Replace:HandleInputFile { ID } { 
 
     scan $ID "%\[^:\]:%\[^:\]:%\[^:\]"  unit type name
 
@@ -22,7 +22,7 @@ proc WOKTools_Replace::HandleInputFile { ID } {
     }
 }
 
-proc WOKTools_Replace::Execute { unit args } {
+proc WOKTools_Replace:Execute { unit args } {
     
     global tcl_interactive
 
@@ -51,16 +51,13 @@ proc WOKTools_Replace::Execute { unit args } {
        regsub -all "/" " $source $target" $replstr  TheArgs
 
         if { [file exist $target] } {
-         set A [catch {eval exec "wokcmp $TheArgs"} result ]
-         if { $result != "" } {
-           set result 0
-         } else { set result 1 }
+         set A [catch {eval "wokcmp $TheArgs"} result ]
        } else {
           set result 0 }
-
+       
        if { ! $result } {
            msgprint -i -c "WOKTools_Replace::Execute" "Copy $source to $target"
-           if { [file exist $target] && [wokparam -e %Station $unit] != "wnt" } {
+           if { [file exist $target] && [wokparam -e %Station] != "wnt" } {
                eval exec "chmod u+w $target"
            }
            eval exec "$copycmd $TheArgs"