From 70782fa19514cf4e9d7b9fd04edfeb899329e913 Mon Sep 17 00:00:00 2001 From: cas Date: Fri, 9 Jun 2000 14:09:51 +0000 Subject: [PATCH] No comments --- src/WOKMake/WOKMake_BuildProcess.cxx | 6 +++--- src/WOKMake/WOKMake_DepItem.lxx | 8 ++++---- src/WOKMake/WOKMake_InputFile.lxx | 2 +- src/WOKMake/WOKMake_MetaStep.cxx | 5 +++++ src/WOKMake/WOKMake_OutputFile.lxx | 4 ++-- src/WOKMake/WOKMake_Step.cxx | 1 + src/WOKMake/WOKMake_Step.lxx | 10 +++++----- src/WOKMake/WOKMake_StepFile.lxx | 16 ++++++++-------- 8 files changed, 29 insertions(+), 23 deletions(-) diff --git a/src/WOKMake/WOKMake_BuildProcess.cxx b/src/WOKMake/WOKMake_BuildProcess.cxx index 3007cad..d14ba36 100755 --- a/src/WOKMake/WOKMake_BuildProcess.cxx +++ b/src/WOKMake/WOKMake_BuildProcess.cxx @@ -304,11 +304,11 @@ const Handle(WOKMake_Step)& WOKMake_BuildProcess::GetAndAddStep(const Handle(WOK if(myunits.IsBound(aunit->Name()) && asubcode.IsNull()) { - ErrorMsg << "WOKMake_BuildProcess::GetAndAddStep" + WarningMsg << "WOKMake_BuildProcess::GetAndAddStep" << "Cannot get step (" << acode << ") for unit " << aunit->Name() << " (type : " << aunit->Type() << ")" << endm; - return NULLRESULT; +// return NULLRESULT; } - else +// else { Handle(WOKMake_Step) thestep = WOKMake_StepBuilder::BuildStep(this, aunit, acode,asubcode); if(!thestep.IsNull()) diff --git a/src/WOKMake/WOKMake_DepItem.lxx b/src/WOKMake/WOKMake_DepItem.lxx index cc2e71c..ba4559c 100755 --- a/src/WOKMake/WOKMake_DepItem.lxx +++ b/src/WOKMake/WOKMake_DepItem.lxx @@ -9,7 +9,7 @@ //function : IssuedFrom //purpose : //======================================================================= -const Handle(TCollection_HAsciiString)& WOKMake_DepItem::IssuedFrom() const +inline const Handle(TCollection_HAsciiString)& WOKMake_DepItem::IssuedFrom() const { return myorigin; } @@ -18,7 +18,7 @@ const Handle(TCollection_HAsciiString)& WOKMake_DepItem::IssuedFrom() const //function : OutputFile //purpose : //======================================================================= -const Handle(TCollection_HAsciiString)& WOKMake_DepItem::OutputFile() const +inline const Handle(TCollection_HAsciiString)& WOKMake_DepItem::OutputFile() const { return myfile; } @@ -28,7 +28,7 @@ const Handle(TCollection_HAsciiString)& WOKMake_DepItem::OutputFile() const //function : IsDirectDep //purpose : //======================================================================= -Standard_Boolean WOKMake_DepItem::IsDirectDep() const +inline Standard_Boolean WOKMake_DepItem::IsDirectDep() const { return mydirect; } @@ -38,7 +38,7 @@ Standard_Boolean WOKMake_DepItem::IsDirectDep() const //function : Status //purpose : //======================================================================= -WOKMake_FileStatus WOKMake_DepItem::Status() const +inline WOKMake_FileStatus WOKMake_DepItem::Status() const { return mystatus; } diff --git a/src/WOKMake/WOKMake_InputFile.lxx b/src/WOKMake/WOKMake_InputFile.lxx index 63a5531..a496745 100755 --- a/src/WOKMake/WOKMake_InputFile.lxx +++ b/src/WOKMake/WOKMake_InputFile.lxx @@ -9,7 +9,7 @@ //function : IsDirectInput //purpose : //======================================================================= -Standard_Boolean WOKMake_InputFile::IsDirectInput() const +inline Standard_Boolean WOKMake_InputFile::IsDirectInput() const { if(myattr & STEPFILE_DIRECT) return Standard_True; else return Standard_False; diff --git a/src/WOKMake/WOKMake_MetaStep.cxx b/src/WOKMake/WOKMake_MetaStep.cxx index c36af22..c8f9ce0 100755 --- a/src/WOKMake/WOKMake_MetaStep.cxx +++ b/src/WOKMake/WOKMake_MetaStep.cxx @@ -124,6 +124,7 @@ Handle(TColStd_HSequenceOfHAsciiString) WOKMake_MetaStep::GetUnderlyingSteps() for(i=1; i<=subcodeseq->Length(); i++) { Handle(TCollection_HAsciiString) thesubcode = subcodeseq->Value(i); +// cout << "WOKMake_MetaStep::GetUnderlyingSteps1 -> GetAndAddStep" << endl ; Handle(WOKMake_Step) thestep = BuildProcess()->GetAndAddStep(Unit(), Code(), thesubcode); if(thestep.IsNull()) @@ -158,10 +159,12 @@ Handle(TColStd_HSequenceOfHAsciiString) WOKMake_MetaStep::GetUnderlyingSteps() if(apart->IsEmpty()) { +// cout << "WOKMake_MetaStep::GetUnderlyingSteps2 -> GetAndAddStep" << endl ; precstep = BuildProcess()->GetAndAddStep(precunit, acode, Handle(TCollection_HAsciiString)()); } else { +// cout << "WOKMake_MetaStep::GetUnderlyingSteps3 -> GetAndAddStep" << endl ; precstep = BuildProcess()->GetAndAddStep(precunit, acode, apart); } @@ -249,6 +252,7 @@ Handle(TColStd_HSequenceOfHAsciiString) WOKMake_MetaStep::GetLastUnderlyingSteps Handle(TCollection_HAsciiString) acode = outfile->ID()->Token(":", 2); Handle(TCollection_HAsciiString) apart = outfile->ID()->Token(":", 3); +// cout << "WOKMake_MetaStep::GetUnderlyingSteps4 -> GetAndAddStep" << endl ; Handle(WOKMake_Step) thestep = BuildProcess()->GetAndAddStep(Unit(), acode, apart); if(thestep.IsNull()) @@ -535,6 +539,7 @@ Standard_Boolean WOKMake_MetaStep::HandleOutputFile(const Handle(WOKMake_OutputF case WOKMake_Disappeared: { Handle(TCollection_HAsciiString) apart = afile->ID()->Token(":", 3); +// cout << "WOKMake_MetaStep::HandleOutputFile -> GetAndAddStep" << endl ; Handle(WOKMake_Step) thesubstep = BuildProcess()->GetAndAddStep(Unit(), Code(), apart); if (!thesubstep.IsNull()) { diff --git a/src/WOKMake/WOKMake_OutputFile.lxx b/src/WOKMake/WOKMake_OutputFile.lxx index 6bb694e..d015d6e 100755 --- a/src/WOKMake/WOKMake_OutputFile.lxx +++ b/src/WOKMake/WOKMake_OutputFile.lxx @@ -10,7 +10,7 @@ //function : IsProduction //purpose : //======================================================================= -Standard_Boolean WOKMake_OutputFile::IsProduction() const +inline Standard_Boolean WOKMake_OutputFile::IsProduction() const { if(myattr & STEPFILE_REFPROD) return Standard_True; else return Standard_False; @@ -21,7 +21,7 @@ Standard_Boolean WOKMake_OutputFile::IsProduction() const //function : IsMember //purpose : //======================================================================= -Standard_Boolean WOKMake_OutputFile::IsMember() const +inline Standard_Boolean WOKMake_OutputFile::IsMember() const { if(myattr & STEPFILE_MEMBEXT) return Standard_True; else return Standard_False; diff --git a/src/WOKMake/WOKMake_Step.cxx b/src/WOKMake/WOKMake_Step.cxx index c886de5..2df8ccf 100755 --- a/src/WOKMake/WOKMake_Step.cxx +++ b/src/WOKMake/WOKMake_Step.cxx @@ -1524,6 +1524,7 @@ Standard_Boolean WOKMake_Step::HandleOutputFile(const Handle(WOKMake_OutputFile) if(afile->File()->Path()->Exists() || afile->File()->Path()->IsSymLink()) { Unit()->Params().Set("%FilePath", afile->File()->Path()->Name()->ToCString()); +// cout << "WOKMake_Step : " << afile->File()->Path()->Name()->ToCString() << endl ; acmd = Unit()->Params().Eval(atempl->ToCString(),Standard_True); diff --git a/src/WOKMake/WOKMake_Step.lxx b/src/WOKMake/WOKMake_Step.lxx index b8426f7..0d6d1ed 100755 --- a/src/WOKMake/WOKMake_Step.lxx +++ b/src/WOKMake/WOKMake_Step.lxx @@ -12,7 +12,7 @@ //function : BuildProcess //purpose : //======================================================================= -Handle(WOKMake_BuildProcess) WOKMake_Step::BuildProcess() const +inline Handle(WOKMake_BuildProcess) WOKMake_Step::BuildProcess() const { return myprocess; } @@ -22,7 +22,7 @@ Handle(WOKMake_BuildProcess) WOKMake_Step::BuildProcess() const //function : Unit //purpose : //======================================================================= -const Handle(WOKernel_DevUnit)& WOKMake_Step::Unit() const +inline const Handle(WOKernel_DevUnit)& WOKMake_Step::Unit() const { return myunit; } @@ -33,7 +33,7 @@ const Handle(WOKernel_DevUnit)& WOKMake_Step::Unit() const //function : Locator //purpose : //======================================================================= -const Handle(WOKernel_Locator)& WOKMake_Step::Locator() const +inline const Handle(WOKernel_Locator)& WOKMake_Step::Locator() const { return myprocess->Locator(); } @@ -44,7 +44,7 @@ const Handle(WOKernel_Locator)& WOKMake_Step::Locator() const //function : Locator //purpose : //======================================================================= -const Handle(WOKUtils_Shell)& WOKMake_Step::Shell() const +inline const Handle(WOKUtils_Shell)& WOKMake_Step::Shell() const { return myprocess->Shell(); } @@ -55,7 +55,7 @@ const Handle(WOKUtils_Shell)& WOKMake_Step::Shell() const //function : Locator //purpose : //======================================================================= -const Handle(WOKernel_UnitGraph)& WOKMake_Step::UnitGraph() const +inline const Handle(WOKernel_UnitGraph)& WOKMake_Step::UnitGraph() const { return myprocess->UnitGraph(); } diff --git a/src/WOKMake/WOKMake_StepFile.lxx b/src/WOKMake/WOKMake_StepFile.lxx index cb3e649..a59a2b7 100755 --- a/src/WOKMake/WOKMake_StepFile.lxx +++ b/src/WOKMake/WOKMake_StepFile.lxx @@ -22,7 +22,7 @@ //function : ID //purpose : //======================================================================= -const Handle(TCollection_HAsciiString)& WOKMake_StepFile::ID() const +inline const Handle(TCollection_HAsciiString)& WOKMake_StepFile::ID() const { return myid; } @@ -32,7 +32,7 @@ const Handle(TCollection_HAsciiString)& WOKMake_StepFile::ID() const //function : File //purpose : //======================================================================= -const Handle(WOKernel_File)& WOKMake_StepFile::File() const +inline const Handle(WOKernel_File)& WOKMake_StepFile::File() const { return myfile; } @@ -43,7 +43,7 @@ const Handle(WOKernel_File)& WOKMake_StepFile::File() const //function : BuilderEntity //purpose : //======================================================================= -const Handle(WOKBuilder_Entity)& WOKMake_StepFile::BuilderEntity() const +inline const Handle(WOKBuilder_Entity)& WOKMake_StepFile::BuilderEntity() const { return myent; } @@ -53,7 +53,7 @@ const Handle(WOKBuilder_Entity)& WOKMake_StepFile::BuilderEntity() const //function : LastPath //purpose : //======================================================================= -const Handle(WOKUtils_Path)& WOKMake_StepFile::LastPath() const +inline const Handle(WOKUtils_Path)& WOKMake_StepFile::LastPath() const { return mylastpath; } @@ -64,7 +64,7 @@ const Handle(WOKUtils_Path)& WOKMake_StepFile::LastPath() const //function : Status //purpose : //======================================================================= -WOKMake_FileStatus WOKMake_StepFile::Status() const +inline WOKMake_FileStatus WOKMake_StepFile::Status() const { return mystatus; } @@ -74,7 +74,7 @@ WOKMake_FileStatus WOKMake_StepFile::Status() const //function : IsLocateAble //purpose : //======================================================================= -Standard_Boolean WOKMake_StepFile::IsLocateAble() const +inline Standard_Boolean WOKMake_StepFile::IsLocateAble() const { if(myattr & STEPFILE_LOCATE) return Standard_True; else return Standard_False; @@ -86,7 +86,7 @@ Standard_Boolean WOKMake_StepFile::IsLocateAble() const //function : IsPhysic //purpose : //======================================================================= -Standard_Boolean WOKMake_StepFile::IsPhysic() const +inline Standard_Boolean WOKMake_StepFile::IsPhysic() const { if(myattr & STEPFILE_PHYSIC) return Standard_True; else return Standard_False; @@ -97,7 +97,7 @@ Standard_Boolean WOKMake_StepFile::IsPhysic() const //function : IsXStep //purpose : //======================================================================= -Standard_Boolean WOKMake_StepFile::IsStepID() const +inline Standard_Boolean WOKMake_StepFile::IsStepID() const { if(myattr & STEPFILE_STEPID) return Standard_True; else return Standard_False; -- 2.39.5