No comments

diff --git a/src/WOKMake/WOKMake_BuildProcessIterator.cxx b/src/WOKMake/WOKMake_BuildProcessIterator.cxx
index 4717bd7cb43aff52992ffa1c7aa94708d6bb049f..93cfd0845fa473fa47a11966fbc34718c662d3f8 100755 (executable)
--- a/src/WOKMake/WOKMake_BuildProcessIterator.cxx
+++ b/src/WOKMake/WOKMake_BuildProcessIterator.cxx
@@ -603,7 +603,7 @@ void WOKMake_BuildProcessIterator::ReorderCurrentGroup()
              }
              else {
                filepack->GetPath();
-               WOKUtils_AdmFile afile(filepack->Path());
+               WOKUtils_AdmFile afile(filepack->Path()->Name());
                Handle(TColStd_HSequenceOfHAsciiString) udsoftk = afile.Read();
                
                for (Standard_Integer j=1;j<= udsoftk->Length(); j++) {

diff --git a/src/WOKMake/WOKMake_Step.cxx b/src/WOKMake/WOKMake_Step.cxx
index 2df8ccfa20d5b352b376cf7d35229e1f04dccc21..9ce4284d45407ed1cbcf85029009543c90fb3e49 100755 (executable)
--- a/src/WOKMake/WOKMake_Step.cxx
+++ b/src/WOKMake/WOKMake_Step.cxx
@@ -340,13 +340,12 @@ void WOKMake_Step::LoadDependencies()
   
   Handle(WOKernel_File) depfile    = LocateAdmFile(InLocator(), DepItemsFileName());
   if(depfile.IsNull()) return;
-  
+
   WOKMake_InputFile::ReadFile(inputfile->Path(), InLocator(),   mydepin);
   WOKMake_OutputFile::ReadFile(outputfile->Path(), OutLocator(), mydepout);
   WOKMake_DepItem::ReadFile(depfile->Path(), mydepitems);
 
-
-  if(mydepout.Extent() && mydepin.Extent())
+  if((mydepout.Extent()>0) && (mydepin.Extent()>0))
     {
       mydepmatrix = new TColStd_HArray2OfInteger(1, mydepout.Extent(), 1, mydepin.Extent(), 0);
 
@@ -927,7 +926,6 @@ void WOKMake_Step::AcquitExecution(const Handle(WOKMake_HSequenceOfInputFile)& e
 
   // Chargement de la map d'execution
   WOKTools_MapOfHAsciiString execmap;
-
   for(i=1; i<=execlist->Length(); i++)
     {
       execmap.Add(execlist->Value(i)->ID());
@@ -1018,7 +1016,7 @@ void WOKMake_Step::AcquitExecution(const Handle(WOKMake_HSequenceOfInputFile)& e
   Standard_Integer in_index, out_index;
   Standard_Integer depvalue, value;
   
-  if(outmap.Extent() && inmap.Extent())
+  if(outmap.Extent()>0 && inmap.Extent()>0)
     {
       matrix = new TColStd_HArray2OfInteger(1, outmap.Extent(), 1, inmap.Extent(), 0);