No comments

diff --git a/src/WOKTools/FILES b/src/WOKTools/FILES
index 3b82d85ee10f6df94e8240f14514a1893896ed0a..b209cc31a01cf9277e22bc9fd018c339499bebf6 100755 (executable)
--- a/src/WOKTools/FILES
+++ b/src/WOKTools/FILES
@@ -1,3 +1,4 @@
+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 880a11288b5db7971a4cfac28416ad8aad343726..08865fdc947da5925c71039dc7b37cf40f7d330b 100755 (executable)
--- a/src/WOKTools/WOKTools_BasicMap.cxx
+++ b/src/WOKTools/WOKTools_BasicMap.cxx
@@ -1,4 +1,3 @@
-static const char* sccsid = "@(#)WOKTools_BasicMap.cxx 3.2 95/01/10"; // Do not delete this line. Used by sccs.
 // File:       WOKTools_BasicMap.cxx
 // Created:    Fri Feb 26 17:20:43 1993
 // Author:     Remi LEQUETTE
@@ -28,12 +27,12 @@ static const char* sccsid = "@(#)WOKTools_BasicMap.cxx      3.2 95/01/10"; // Do not
 
 WOKTools_BasicMap::WOKTools_BasicMap(const Standard_Integer NbBuckets, 
                                           const Standard_Boolean single) :
+       myData1(NULL),
+       myData2(NULL),
        isDouble(!single),
        mySaturated(Standard_False),
        myNbBuckets(NbBuckets),
-       mySize(0),
-       myData1(NULL),
-       myData2(NULL)
+       mySize(0)
 {
 }
 

diff --git a/src/WOKTools/WOKTools_BasicMapIterator.cxx b/src/WOKTools/WOKTools_BasicMapIterator.cxx
index d2bd88d386dacb109777cf82417ace2714a22592..2cc1cb5b383aa7ed0dba10b2fba25201bc155c66 100755 (executable)
--- a/src/WOKTools/WOKTools_BasicMapIterator.cxx
+++ b/src/WOKTools/WOKTools_BasicMapIterator.cxx
@@ -1,4 +1,3 @@
-static const char* sccsid = "@(#)WOKTools_BasicMapIterator.cxx 3.2 95/01/10"; // Do not delete this line. Used by sccs.
 // File:       WOKTools_BasicMapIterator.cxx
 // Created:    Fri Feb 26 15:46:25 1993
 // Author:     Remi LEQUETTE
@@ -14,10 +13,10 @@ static const char* sccsid = "@(#)WOKTools_BasicMapIterator.cxx      3.2 95/01/10"; //
 //=======================================================================
 
 WOKTools_BasicMapIterator::WOKTools_BasicMapIterator () :
+       myNode(NULL),
        myNbBuckets(0),
        myBuckets(NULL),
-       myBucket(0),
-       myNode(NULL)
+       myBucket(0)
 {}
 
 
@@ -28,10 +27,10 @@ WOKTools_BasicMapIterator::WOKTools_BasicMapIterator () :
 
 WOKTools_BasicMapIterator::WOKTools_BasicMapIterator 
   (const WOKTools_BasicMap& M) :
+  myNode(NULL),
   myNbBuckets(M.myNbBuckets),
   myBuckets(M.myData1),
-  myBucket(-1),
-  myNode(NULL)
+  myBucket(-1)
 {
   if (!myBuckets) myNbBuckets = -1;
   Next();

diff --git a/src/WOKTools/WOKTools_CStringHasher.cxx b/src/WOKTools/WOKTools_CStringHasher.cxx
index 69aab512996c09725ce71ee60cea8da7efc6819c..e21d4831aeb31c3fa9cb2e84eae733363444d915 100755 (executable)
--- a/src/WOKTools/WOKTools_CStringHasher.cxx
+++ b/src/WOKTools/WOKTools_CStringHasher.cxx
@@ -23,7 +23,7 @@ Standard_Integer WOKTools_CStringHasher::HashCode (const Standard_CString Value)
   alen = strlen(Value);
   
   while(i < alen) {
-    for (count = 0,pos = i;count < sizeof(int); count++) {
+    for (count = 0,pos = i;count < (Standard_Integer)sizeof(int); count++) {
       if (pos + count >= alen)  tabchar[count] = '\0';
       else tabchar[count] = charPtr[pos + count];
       i++;

diff --git a/src/WOKTools/WOKTools_IndexedDataMap.gxx b/src/WOKTools/WOKTools_IndexedDataMap.gxx
index a9fdd8c4582db91346fc66ab3da96757f8395b15..30bce9b53e2bfadc0f1fe1d5f94e49088c08c990 100755 (executable)
--- a/src/WOKTools/WOKTools_IndexedDataMap.gxx
+++ b/src/WOKTools/WOKTools_IndexedDataMap.gxx
@@ -17,7 +17,7 @@ template <class Key, class Item> class IndexedDataMapNode : public WOKTools_MapN
   public :
   IndexedDataMapNode(const Key& K1, const Standard_Integer K2, const Item& I, 
                 const Standard_Integer ahashcode, IndexedDataMapNode* n1, IndexedDataMapNode* n2) 
-    : WOKTools_MapNode(n1),key(K1),index(K2),value(I),hashcode(ahashcode),next2(n2) {}
+    : WOKTools_MapNode(n1),key(K1),index(K2),value(I),next2(n2),hashcode(ahashcode) {}
   void* operator new(size_t aSize) {
     return aStorageManager.Allocate(aSize);
   }

diff --git a/src/WOKTools/WOKTools_IndexedMap.gxx b/src/WOKTools/WOKTools_IndexedMap.gxx
index f089c8705eec54fbf89842b68eb8094f9ac725e2..a62fb4b6e983b87109afc1ec4c1f24e4f2f13b8e 100755 (executable)
--- a/src/WOKTools/WOKTools_IndexedMap.gxx
+++ b/src/WOKTools/WOKTools_IndexedMap.gxx
@@ -15,7 +15,7 @@
 template <class Key> class IndexedMapNode : public WOKTools_MapNode {
   public :
   IndexedMapNode(const Key& K1, const Standard_Integer K2, const Standard_Integer ahashcode, IndexedMapNode* n1, IndexedMapNode* n2) 
-    : WOKTools_MapNode(n1),key(K1),index(K2),hashcode(ahashcode),next2(n2) {}
+    : WOKTools_MapNode(n1),key(K1),index(K2),next2(n2),hashcode(ahashcode) {}
   void* operator new(size_t aSize) {
     return aStorageManager.Allocate(aSize);
   }

diff --git a/src/WOKTools/WOKTools_InterpFileValue.cxx b/src/WOKTools/WOKTools_InterpFileValue.cxx
index 6a67489d37a6ee62b63a9a0eaaf77ef7a7274052..dfe3cf648091e899f12cf3a6c0a1ee0af2c02bed 100755 (executable)
--- a/src/WOKTools/WOKTools_InterpFileValue.cxx
+++ b/src/WOKTools/WOKTools_InterpFileValue.cxx
@@ -106,8 +106,6 @@ Handle(TCollection_HAsciiString) WOKTools_InterpFileValue::InterpFormat(const WO
 //=======================================================================
 WOKTools_InterpFileType WOKTools_InterpFileValue::InterpType(const Handle(TCollection_HAsciiString)& atype)
 {
-  WOKTools_InterpFileType result;
-
   if(!atype.IsNull())
     {
       Standard_CString astr = atype->ToCString();

diff --git a/src/WOKTools/WOKTools_Message.cdl b/src/WOKTools/WOKTools_Message.cdl
index 78eec2ec3f0a7b2030908e56f1dd847166a89f55..975da97e644c1b77c549b58aca80ff9f46dc0bb9 100755 (executable)
--- a/src/WOKTools/WOKTools_Message.cdl
+++ b/src/WOKTools/WOKTools_Message.cdl
@@ -22,6 +22,9 @@ is
 
     Initialize(aclass:CString from Standard; aheader : CString from Standard);
 
+    Destroy ( me );
+    ---C++: alias "Standard_EXPORT virtual ~WOKTools_Message () {}"
+
     Init(me:out);
 
     Code(me)

diff --git a/src/WOKTools/WOKTools_Message.cxx b/src/WOKTools/WOKTools_Message.cxx
index 69a82285f6732f3b63fa5ed5bc490a785bd3aec3..ef985a7bd059d0d7d1bd021002326971c51e748f 100755 (executable)
--- a/src/WOKTools/WOKTools_Message.cxx
+++ b/src/WOKTools/WOKTools_Message.cxx
@@ -47,12 +47,17 @@ WOKTools_Message& FileLogEndMsgHandler(WOKTools_Message& amsgq, const Standard_B
 //function : WOKTools_Message
 //purpose  : 
 //=======================================================================
- WOKTools_Message::WOKTools_Message(const Standard_CString aclass, const Standard_CString aheader)
-   : myheader(aheader), myswitcher(aclass), myison(Standard_True), myprintcontext(Standard_False), myprintheader(Standard_True), 
-     myendmsghandlr(DefaultEndMsgHandler), myindex(1), mylogstream(NULL), mylogflag(Standard_False)
-{
-}
-
+ WOKTools_Message :: WOKTools_Message (
+                      const Standard_CString aclass,
+                      const Standard_CString aheader
+                     ) : myheader(aheader),
+                         myindex(1),
+                         myison(Standard_True),
+                         myprintcontext(Standard_False),
+                         myprintheader(Standard_True), 
+                         myswitcher(aclass),
+                         myendmsghandlr(DefaultEndMsgHandler),
+                         mylogstream(NULL) {}
 //=======================================================================
 //function : Init
 //purpose  : 

diff --git a/src/WOKTools/WOKTools_Message_proto.hxx b/src/WOKTools/WOKTools_Message_proto.hxx
index 780b17b1d3d89e42b5382ca825f7a82d5dd1ebd9..05eb8e9d12d922f214542a7bed4a500890ec5b20 100755 (executable)
--- a/src/WOKTools/WOKTools_Message_proto.hxx
+++ b/src/WOKTools/WOKTools_Message_proto.hxx
@@ -76,6 +76,8 @@ public:
   inline  const Handle(TCollection_HAsciiString)& Message() const;
   inline   Standard_CString ToPrint() const;
 
+  virtual ~WOKTools_Message () {}
+
 protected:
 
   // Methods PROTECTED

diff --git a/src/WOKTools/WOKTools_Messages.hxx b/src/WOKTools/WOKTools_Messages.hxx
index e775d4ca68e9fb7fe61fcc51950d5ef956c003ca..ddb3e7456fc37af6b472f301e880d322f3bd4927 100755 (executable)
--- a/src/WOKTools/WOKTools_Messages.hxx
+++ b/src/WOKTools/WOKTools_Messages.hxx
@@ -31,7 +31,6 @@ extern __WOKTools_API WOKTools_Verbose VerboseMsg;
 extern __WOKTools_API WOKTools_Message& endm(WOKTools_Message&);
 extern __WOKTools_API WOKTools_Message& flushm(WOKTools_Message&);
 
-#define DEB
 #ifdef  DEB
 #define WOK_VERBOSE 1
 #endif

diff --git a/src/WOKTools/WOKTools_Replace.tcl b/src/WOKTools/WOKTools_Replace.tcl
index 1e4aad4ae03531c59de3864a9c913b4e641c47a3..ba8e21ad94b674e62b7d18d29aa3ae1f6702dc64 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,14 +22,14 @@ proc WOKTools_Replace::HandleInputFile { ID } {
     }
 }
 
-proc WOKTools_Replace::Execute { unit args } {
+proc WOKTools_Replace:Execute { unit args } {
     
     global tcl_interactive
 
     set tcl_interactive 1
     package require Wokutils
 
-    msgprint -i -c "WOKTools_Replace::Execute" "Copying of WOKTools includes"
+    msgprint -i -c "WOKTools_Replace:Execute" "Copying of WOKTools includes"
 
     if { [wokparam -e %Station $unit] != "wnt" } {
        set copycmd "cp -p "
@@ -57,13 +57,13 @@ proc WOKTools_Replace::Execute { unit args } {
        }
        
        if { ! $result } {
-           msgprint -i -c "WOKTools_Replace::Execute" "Copy $source to $target"
+           msgprint -i -c "WOKTools_Replace:Execute" "Copy $source to $target"
            if { [wokparam -e %Station $unit] != "wnt" } {
                eval exec "chmod u+w $target"
            }
            eval exec "$copycmd $TheArgs"
        } else {
-           msgprint -i -c "WOKTools_Replace::Execute" "No change in $source"
+           msgprint -i -c "WOKTools_Replace:Execute" "No change in $source"
        }
     }
     return 0;