From: cas <cas@opencascade.com>
Date: Mon, 6 Mar 2000 17:12:59 +0000 (+0000)
Subject: No comments
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=05d6cc6f8e6983d528dea43498510ffa46402119;p=occt-wok.git

No comments
---

diff --git a/src/WOKTools/WOKTools_DataMap.gxx b/src/WOKTools/WOKTools_DataMap.gxx
index a7dd93c..6331971 100755
--- 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 fd7e0c0..c027a30 100755
--- 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 303000a..2a2a2a9 100755
--- 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 cf80cf9..9dcd2d7 100755
--- 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 39fd7ac..4fb6b0c 100755
--- 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"