No comments

diff --git a/src/WOKAPI/FILES b/src/WOKAPI/FILES
index ea47648a99a52195b773af13ee1ff4a0984caff9..ee4939b77212fc89bb3854c18eec4648e5441d10 100755 (executable)
--- a/src/WOKAPI/FILES
+++ b/src/WOKAPI/FILES
@@ -6,3 +6,4 @@ WOKAPI_Command_Parcel.cxx
 WOKAPI_Command_Workbench.cxx
 WOKAPI_Command_Unit.cxx
 WOKAPI_Command_TriggeredMake.cxx
+

diff --git a/src/WOKAPI/WOKAPI_BuildProcess.cxx b/src/WOKAPI/WOKAPI_BuildProcess.cxx
index 8f24c6a5d1e5ef03f45743f1659123973e6cc0e9..e4db55b932d92284bd34f04ea73f3b1b5afb14b2 100755 (executable)
--- a/src/WOKAPI/WOKAPI_BuildProcess.cxx
+++ b/src/WOKAPI/WOKAPI_BuildProcess.cxx
@@ -673,8 +673,9 @@ Standard_Integer WOKAPI_BuildProcess::SelectOnDefines(const Handle(WOKTools_HSeq
 
   UnSelectAll();
   SetForceFlag(Standard_False);
+  Standard_Integer i;
 
-  for(Standard_Integer i=1; i<=defines->Length(); i++)
+  for(i=1; i<=defines->Length(); i++)
     {
       const WOKTools_Define& adefine = defines->Value(i);
       
@@ -795,7 +796,7 @@ Standard_Integer WOKAPI_BuildProcess::SelectOnDefines(const Handle(WOKTools_HSeq
        {
          WOKTools_MapOfHAsciiString typemap;
 
-         for(Standard_Integer i=1; i<=types.Length(); i++)
+         for(i=1; i<=types.Length(); i++)
            {
              const Handle(TCollection_HAsciiString)& atype = types.Value(i);
              if(!typemap.Contains(atype)) typemap.Add(atype);
@@ -816,7 +817,7 @@ Standard_Integer WOKAPI_BuildProcess::SelectOnDefines(const Handle(WOKTools_HSeq
        {
          WOKTools_MapOfHAsciiString typemap;
 
-         for(Standard_Integer i=1; i<=types.Length(); i++)
+         for(i=1; i<=types.Length(); i++)
            {
              const Handle(TCollection_HAsciiString)& atype = types.Value(i);
              if(!typemap.Contains(atype)) typemap.Add(atype);
@@ -839,7 +840,7 @@ Standard_Integer WOKAPI_BuildProcess::SelectOnDefines(const Handle(WOKTools_HSeq
     {
       WOKAPI_SequenceOfUnit wbunits;
       mybench.Units(wbunits);
-      for(Standard_Integer i=1; i<=wbunits.Length(); i++)
+      for(i=1; i<=wbunits.Length(); i++)
        {
          const WOKAPI_Unit& aunit =  wbunits.Value(i);
          const Handle(TCollection_HAsciiString)& aname = aunit.Name();
@@ -853,7 +854,7 @@ Standard_Integer WOKAPI_BuildProcess::SelectOnDefines(const Handle(WOKTools_HSeq
       WOKAPI_SequenceOfUnit wbunits;  
       mybench.Units(wbunits);
 
-      for(Standard_Integer i=1; i<=wbunits.Length(); i++)
+      for(i=1; i<=wbunits.Length(); i++)
        {
          const WOKAPI_Unit& aunit =  wbunits.Value(i);
          const Handle(TCollection_HAsciiString)& aname = aunit.Name();
@@ -992,8 +993,8 @@ void WOKAPI_BuildProcess::SelectedSteps(WOKAPI_SequenceOfMakeStep& aseq) const
 //=======================================================================
 void WOKAPI_BuildProcess::UnitSteps(const WOKAPI_Unit& aunit, WOKAPI_SequenceOfMakeStep& aseq) const
 {
-  const TColStd_SequenceOfHAsciiString& steps = myprocess->GetUnitSteps(aunit.Name());
   WOKAPI_MakeStep apistep;
+  const TColStd_SequenceOfHAsciiString& steps = myprocess->GetUnitSteps(aunit.Name());
 
   for(Standard_Integer i=1; i<=steps.Length(); i++)
     {

diff --git a/src/WOKAPI/WOKAPI_Command.cxx b/src/WOKAPI/WOKAPI_Command.cxx
index 1fd3b1e78e39608a161633ad10ddd072aeed82fc..aceaaaebc040d2501dac0a9a4a855506a973c640 100755 (executable)
--- a/src/WOKAPI/WOKAPI_Command.cxx
+++ b/src/WOKAPI/WOKAPI_Command.cxx
@@ -1317,7 +1317,7 @@ void WOKAPI_Locate_Usage(char *cmd)
 //function : Locate
 //purpose  : 
 //=======================================================================
-WOKAPI_Command::Locate(const WOKAPI_Session& asession,
+Standard_Integer WOKAPI_Command::Locate(const WOKAPI_Session& asession,
                       const Standard_Integer argc, const WOKTools_ArgTable& argv,
                       WOKTools_Return& returns)
 {

diff --git a/src/WOKAPI/WOKAPI_Command_Unit.cxx b/src/WOKAPI/WOKAPI_Command_Unit.cxx
index a286e95e0b9a677eb558e3fea1ed97ae6c58dc82..45f83cbdfaf063503273d767507bb8ffe6f69c59 100755 (executable)
--- a/src/WOKAPI/WOKAPI_Command_Unit.cxx
+++ b/src/WOKAPI/WOKAPI_Command_Unit.cxx
@@ -664,7 +664,7 @@ Standard_Integer WOKAPI_Command::UnitMake(const WOKAPI_Session& asession,
   
   aprocess.SetForceFlag(force);
   
-  Standard_Integer status;
+  Standard_Integer status = 0;
   if(getsteps)
     {
       WOKAPI_SequenceOfMakeStep steps;

diff --git a/src/WOKAPI/WOKAPI_Entity.cdl b/src/WOKAPI/WOKAPI_Entity.cdl
index aa8aacdefa4410806d9c019a63246d494dd53ce7..35461c45ad31cdd32d6acabc8ab7fe2052039f90 100755 (executable)
--- a/src/WOKAPI/WOKAPI_Entity.cdl
+++ b/src/WOKAPI/WOKAPI_Entity.cdl
@@ -36,6 +36,9 @@ is
        returns Entity from WOKAPI;
 
 
+    Destructor ( me : out );
+    ---C++: alias "Standard_EXPORT virtual ~WOKAPI_Entity () {}"
+
     IsValid(me)
        returns Boolean from Standard
        is virtual;

diff --git a/src/WOKAPI/WOKAPI_MakeOption.cxx b/src/WOKAPI/WOKAPI_MakeOption.cxx
index b450faa6dca4f745fdc795d4d81f906873fa75b8..6cbd789b772eece3f57b11374da7a25a01378909 100755 (executable)
--- a/src/WOKAPI/WOKAPI_MakeOption.cxx
+++ b/src/WOKAPI/WOKAPI_MakeOption.cxx
@@ -23,7 +23,11 @@ WOKAPI_MakeOption::WOKAPI_MakeOption()
 //purpose  : 
 //=======================================================================
 WOKAPI_MakeOption::WOKAPI_MakeOption(const WOKAPI_MakeOption& another)
-  : mycode(another.Code()), mytype(another.Type()), mytargets(another.Targets()), myforce(another.IsForced()), myplatforms(another.Platforms())
+  : mycode(another.Code()),
+    myforce(another.IsForced()),
+    mytype(another.Type()),
+    mytargets(another.Targets()),
+    myplatforms(another.Platforms())
 {
 }
 //=======================================================================
@@ -34,7 +38,7 @@ WOKAPI_MakeOption::WOKAPI_MakeOption(const Handle(TCollection_HAsciiString)& ast
                                     const WOKAPI_StepType atype,
                                     const Handle(TColStd_HSequenceOfHAsciiString)& targets,
                                     const Standard_Boolean forced)
-  : mycode(astr), mytype(atype), mytargets(targets), myforce(forced)
+  : mycode(astr), myforce(forced), mytype(atype), mytargets(targets)
 {
 }
 //=======================================================================
@@ -46,7 +50,7 @@ WOKAPI_MakeOption::WOKAPI_MakeOption(const Handle(TCollection_HAsciiString)& ast
                                     const Handle(TColStd_HSequenceOfHAsciiString)& targets,
                                     const Standard_Boolean forced,
                                     const Handle(TColStd_HSequenceOfHAsciiString) & platforms)
-  : mycode(astr), mytype(atype), mytargets(targets), myforce(forced),myplatforms(platforms)
+  : mycode(astr), myforce(forced), mytype(atype), mytargets(targets), myplatforms(platforms)
 {
 }
 

diff --git a/src/WOKAPI/WOKAPI_Process.cxx b/src/WOKAPI/WOKAPI_Process.cxx
index d8a91c715bb16a69fb49853aec1df9090328e0d8..45a31b882c2ab62f29f4ed52db4ce63f4871ccd2 100755 (executable)
--- a/src/WOKAPI/WOKAPI_Process.cxx
+++ b/src/WOKAPI/WOKAPI_Process.cxx
@@ -81,8 +81,6 @@ Standard_Integer WOKAPI_Process::ExploreInitSection(const Handle(TColStd_HSequen
   static char WorkbenchStr[] = "Workbench";
 
   static char ModeStr[]      = "Mode";
-  static char DebugStr[]     = "Debug";
-  static char OptimiseStr[]  = "Optimise";
 
   static char DBMSStr[]      = "DBMS";
 
@@ -465,11 +463,6 @@ Standard_Boolean WOKAPI_Process::ExecuteBuild(const Handle(WOKTools_HSequenceOfD
 Standard_Boolean WOKAPI_Process::ExecuteFile(const Handle(TCollection_HAsciiString)& afile)
 {
   static char BuildStr[]     = ":Build";
-
-  static char ForceStr[]     = "Force";
-  static char YesStr[]       = "Yes";
-  static char NoStr[]        = "No";
-
   static char TclStr[]       = ":Tcl";
 
   Standard_Integer index;

diff --git a/src/WOKAPI/WOKAPI_Session.cxx b/src/WOKAPI/WOKAPI_Session.cxx
index cfc6f2c8cc61ce748b0cc8373b2c5b6d258bafe8..78984a154f9a970ef037c584c0a0f69df3028896 100755 (executable)
--- a/src/WOKAPI/WOKAPI_Session.cxx
+++ b/src/WOKAPI/WOKAPI_Session.cxx
@@ -289,7 +289,7 @@ void WOKAPI_Session::Close()
 void WOKAPI_Session::GeneralFailure(const Handle(Standard_Failure)& )
 {
   
-  static FailedInOpen;
+  static Standard_Boolean FailedInOpen;
   OSD::SetSignal();                  //==== ReArm the signals. =============
 #ifndef WNT
   WOKUtils_Signal::Arm(WOKUtils_SIGINT,    (WOKUtils_SigHandler) NULL);