From 1f3c3637f1a1a389b0f827a60379862f83e9ee2a Mon Sep 17 00:00:00 2001 From: cas Date: Wed, 24 Nov 1999 18:03:07 +0000 Subject: [PATCH] No comments --- src/WOKTools/FILES | 1 - src/WOKTools/WOKTools_BasicMap.cxx | 12 ++++++------ src/WOKTools/WOKTools_BasicMap.lxx | 3 ++- src/WOKTools/WOKTools_DataMap.gxx | 8 ++++---- src/WOKTools/WOKTools_DoubleMap.gxx | 8 ++++---- src/WOKTools/WOKTools_IndexedDataMap.gxx | 8 ++++---- src/WOKTools/WOKTools_IndexedMap.gxx | 8 ++++---- src/WOKTools/WOKTools_Map.gxx | 8 ++++---- src/WOKTools/WOKTools_Replace.tcl | 14 +++++++------- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/WOKTools/FILES b/src/WOKTools/FILES index b209cc3..3b82d85 100755 --- a/src/WOKTools/FILES +++ b/src/WOKTools/FILES @@ -1,4 +1,3 @@ -WOKTools_WOKSteps.edl WOKTools_PUsage.hxx WOKTools_ArgTable.hxx WOKTools_MsgHandler.hxx diff --git a/src/WOKTools/WOKTools_BasicMap.cxx b/src/WOKTools/WOKTools_BasicMap.cxx index 08865fd..2bd5299 100755 --- a/src/WOKTools/WOKTools_BasicMap.cxx +++ b/src/WOKTools/WOKTools_BasicMap.cxx @@ -56,10 +56,10 @@ Standard_Boolean WOKTools_BasicMap::BeginResize else return Standard_False; } - data1 = aStorageManager.Allocate((N+1)*sizeof(void*)); + data1 = Standard::Allocate((N+1)*sizeof(void*)); memset(data1, 0, (N+1)*sizeof(void*)); if (isDouble) { - data2 = aStorageManager.Allocate((N+1)*sizeof(void*)); + data2 = Standard::Allocate((N+1)*sizeof(void*)); memset(data2, 0, (N+1)*sizeof(void*)); } else @@ -79,9 +79,9 @@ void WOKTools_BasicMap::EndResize(const Standard_Integer NbBuckets, const Standard_Address data2) { if (myData1) - aStorageManager.Free(myData1,(myNbBuckets+1)*sizeof(void*)); + Standard::Free(myData1,(myNbBuckets+1)*sizeof(void*)); if (myData2) - aStorageManager.Free(myData2,(myNbBuckets+1)*sizeof(void*)); + Standard::Free(myData2,(myNbBuckets+1)*sizeof(void*)); myNbBuckets = N; mySaturated = myNbBuckets <= NbBuckets; myData1 = data1; @@ -99,10 +99,10 @@ void WOKTools_BasicMap::Destroy() mySize = 0; mySaturated = Standard_False; if (myData1) - aStorageManager.Free(myData1,(myNbBuckets+1)*sizeof(void*)); + Standard::Free(myData1,(myNbBuckets+1)*sizeof(void*)); if (isDouble) { if (myData2) - aStorageManager.Free(myData2,(myNbBuckets+1)*sizeof(void*)); + Standard::Free(myData2,(myNbBuckets+1)*sizeof(void*)); } myData1 = myData2 = NULL; } diff --git a/src/WOKTools/WOKTools_BasicMap.lxx b/src/WOKTools/WOKTools_BasicMap.lxx index a8a46a7..a941e16 100755 --- a/src/WOKTools/WOKTools_BasicMap.lxx +++ b/src/WOKTools/WOKTools_BasicMap.lxx @@ -5,7 +5,8 @@ #include -extern Standard_IMPORT MMgt_StorageManager aStorageManager; +//extern Standard_IMPORT MMgt_StorageManager aStorageManager; +//Standard_IMPORT MMgt_StorageManager aStorageManager; //======================================================================= diff --git a/src/WOKTools/WOKTools_DataMap.gxx b/src/WOKTools/WOKTools_DataMap.gxx index 3f4dc61..a7dd93c 100755 --- a/src/WOKTools/WOKTools_DataMap.gxx +++ b/src/WOKTools/WOKTools_DataMap.gxx @@ -16,9 +16,9 @@ template class DataMapNode : public WOKTools_MapNode { DataMapNode(const Key& K, const Standard_Integer ahascode, const Item& I, DataMapNode* n) : WOKTools_MapNode(n), key(K), hashcode(ahascode) { value = I; } void* operator new(size_t aSize) - {return aStorageManager.Allocate(aSize);} + {return Standard::Allocate(aSize);} void operator delete(void* aNode, size_t aSize) { - aStorageManager.Free(aNode,aSize); + Standard::Free(aNode,aSize); } Key key; @@ -35,9 +35,9 @@ class Node : public WOKTools_MapNode { Node(const TheKey& K, const Standard_Integer ahascode, const TheItem& I, Node* n) : WOKTools_MapNode(n), key(K), hashcode(ahascode) { value = I; } void* operator new(size_t aSize) - {return aStorageManager.Allocate(aSize);} + {return Standard::Allocate(aSize);} void operator delete(void* aNode, size_t aSize) { - aStorageManager.Free(aNode,aSize); + Standard::Free(aNode,aSize); } TheKey key; diff --git a/src/WOKTools/WOKTools_DoubleMap.gxx b/src/WOKTools/WOKTools_DoubleMap.gxx index 5b57b14..ac0220c 100755 --- a/src/WOKTools/WOKTools_DoubleMap.gxx +++ b/src/WOKTools/WOKTools_DoubleMap.gxx @@ -17,9 +17,9 @@ template class DoubleMapNode : public WOKTools_MapNode{ Node(const Key1& K1, const Standard_Integer acode1, const Key2& K2, const Standard_Integer acode2, DoubleMapNode* n1, DoubleMapNode* n2) : WOKTools_MapNode(n1),key1(K1),hashcode1(acode1), key2(K2), hashcode2(acode2), next2(n2) {} void* operator new(size_t aSize) - {return aStorageManager.Allocate(aSize);} + {return Standard::Allocate(aSize);} void operator delete(void* aNode, size_t aSize) { - aStorageManager.Free(aNode,aSize); + Standard::Free(aNode,aSize); } Key1 key1; @@ -38,9 +38,9 @@ class Node : public WOKTools_MapNode{ Node(const TheKey1& K1, const Standard_Integer acode1, const TheKey2& K2, const Standard_Integer acode2, Node* n1, Node* n2) : WOKTools_MapNode(n1),key1(K1),hashcode1(acode1), key2(K2), hashcode2(acode2), next2(n2) {} void* operator new(size_t aSize) - {return aStorageManager.Allocate(aSize);} + {return Standard::Allocate(aSize);} void operator delete(void* aNode, size_t aSize) { - aStorageManager.Free(aNode,aSize); + Standard::Free(aNode,aSize); } TheKey1 key1; diff --git a/src/WOKTools/WOKTools_IndexedDataMap.gxx b/src/WOKTools/WOKTools_IndexedDataMap.gxx index 30bce9b..fd7e0c0 100755 --- a/src/WOKTools/WOKTools_IndexedDataMap.gxx +++ b/src/WOKTools/WOKTools_IndexedDataMap.gxx @@ -19,10 +19,10 @@ template class IndexedDataMapNode : public WOKTools_MapN const Standard_Integer ahashcode, IndexedDataMapNode* n1, IndexedDataMapNode* n2) : WOKTools_MapNode(n1),key(K1),index(K2),value(I),next2(n2),hashcode(ahashcode) {} void* operator new(size_t aSize) { - return aStorageManager.Allocate(aSize); + return Standard::Allocate(aSize); } void operator delete(void* aNode, size_t aSize) { - aStorageManager.Free(aNode,aSize); + Standard::Free(aNode,aSize); } Key key; @@ -42,10 +42,10 @@ class Node : public WOKTools_MapNode { const Standard_Integer ahashcode, Node* n1, Node* n2) : WOKTools_MapNode(n1),key(K1),index(K2),hashcode(ahashcode),next2(n2) { value =I;} void* operator new(size_t aSize) { - return aStorageManager.Allocate(aSize); + return Standard::Allocate(aSize); } void operator delete(void* aNode, size_t aSize) { - aStorageManager.Free(aNode,aSize); + Standard::Free(aNode,aSize); } TheKey key; diff --git a/src/WOKTools/WOKTools_IndexedMap.gxx b/src/WOKTools/WOKTools_IndexedMap.gxx index a62fb4b..303000a 100755 --- a/src/WOKTools/WOKTools_IndexedMap.gxx +++ b/src/WOKTools/WOKTools_IndexedMap.gxx @@ -17,10 +17,10 @@ template class IndexedMapNode : public WOKTools_MapNode { IndexedMapNode(const Key& K1, const Standard_Integer K2, const Standard_Integer ahashcode, IndexedMapNode* n1, IndexedMapNode* n2) : WOKTools_MapNode(n1),key(K1),index(K2),next2(n2),hashcode(ahashcode) {} void* operator new(size_t aSize) { - return aStorageManager.Allocate(aSize); + return Standard::Allocate(aSize); } void operator delete(void* aNode, size_t aSize) { - aStorageManager.Free(aNode,aSize); + Standard::Free(aNode,aSize); } Key key; @@ -39,10 +39,10 @@ class Node : public WOKTools_MapNode { Node(const TheKey& K, const Standard_Integer theIndex, const Standard_Integer ahashcode, Node* n1, Node* n2) : WOKTools_MapNode(n1),key(K),index(theIndex),hashcode(ahashcode),next2(n2) {} void* operator new(size_t aSize) { - return aStorageManager.Allocate(aSize); + return Standard::Allocate(aSize); } void operator delete(void* aNode, size_t aSize) { - aStorageManager.Free(aNode,aSize); + Standard::Free(aNode,aSize); } TheKey key; diff --git a/src/WOKTools/WOKTools_Map.gxx b/src/WOKTools/WOKTools_Map.gxx index 304f623..cf80cf9 100755 --- a/src/WOKTools/WOKTools_Map.gxx +++ b/src/WOKTools/WOKTools_Map.gxx @@ -15,9 +15,9 @@ template class MapNode : public WOKTools_MapNode { public : MapNode(const TheKey& K, const Standard_Integer ahascode, MapNode* n) : WOKTools_MapNode(n),key(K), hashcode(ahascode) {} void* operator new(size_t aSize) - {return aStorageManager.Allocate(aSize);} + {return Standard::Allocate(aSize);} void operator delete(void* aNode, size_t aSize) { - aStorageManager.Free(aNode,aSize); + Standard::Free(aNode,aSize); } TheKey key; Standard_Integer hashcode; @@ -31,9 +31,9 @@ class Node : public WOKTools_MapNode { public : Node(const TheKey& K, const Standard_Integer ahascode, Node* n) : WOKTools_MapNode(n),key(K), hashcode(ahascode) {} void* operator new(size_t aSize) - {return aStorageManager.Allocate(aSize);} + {return Standard::Allocate(aSize);} void operator delete(void* aNode, size_t aSize) { - aStorageManager.Free(aNode,aSize); + Standard::Free(aNode,aSize); } TheKey key; Standard_Integer hashcode; diff --git a/src/WOKTools/WOKTools_Replace.tcl b/src/WOKTools/WOKTools_Replace.tcl index 2fffb98..453a788 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 @@ -50,15 +50,15 @@ proc WOKTools_Replace:Execute { unit args } { regsub -all "/" " $source $target" $replstr TheArgs - set A [catch {eval "wokcmp $TheArgs"} result ] + set A [catch {eval exec "cmp $TheArgs"} result ] - if { [wokparam -e %Station $unit] == "wnt" && $result != "" } { + if { $result != "" } { set result 0 } else { set result 1 } if { ! $result } { msgprint -i -c "WOKTools_Replace::Execute" "Copy $source to $target" - if { [wokparam -e %Station $unit] != "wnt" } { + if { [file exist $target] && [wokparam -e %Station $unit] != "wnt" } { eval exec "chmod u+w $target" } eval exec "$copycmd $TheArgs" -- 2.39.5