From fc9e7f576ce83ed206d7f5a33fab465f9276f239 Mon Sep 17 00:00:00 2001 From: cascade Date: Fri, 13 Feb 2009 18:33:58 +0000 Subject: [PATCH] OCC20850 umake command do not work on SunOS10 --- src/WOKDeliv/WOKDeliv_DelivBuildArchive.cxx | 2 +- src/WOKDeliv/WOKDeliv_DelivBuildExec.cxx | 8 ++--- src/WOKDeliv/WOKDeliv_DelivBuildSource.cxx | 8 ++--- src/WOKDeliv/WOKDeliv_DeliveryBase.cxx | 14 ++++---- src/WOKDeliv/WOKDeliv_DeliveryCopy.cxx | 2 +- src/WOKDeliv/WOKDeliv_DeliveryDATA.cxx | 12 +++---- src/WOKDeliv/WOKDeliv_DeliveryExecList.cxx | 26 +++++++------- src/WOKDeliv/WOKDeliv_DeliveryFiles.cxx | 2 +- src/WOKDeliv/WOKDeliv_DeliveryGET.cxx | 8 ++--- src/WOKDeliv/WOKDeliv_DeliveryLIB.cxx | 12 +++---- src/WOKDeliv/WOKDeliv_DeliveryListShared.cxx | 2 +- src/WOKDeliv/WOKDeliv_DeliveryMetaStep.cxx | 4 +-- src/WOKDeliv/WOKDeliv_DeliveryOBJSSchema.cxx | 6 ++-- src/WOKDeliv/WOKDeliv_DeliverySOURCES.cxx | 6 ++-- src/WOKDeliv/WOKDeliv_DeliverySTUBClient.cxx | 8 ++--- src/WOKDeliv/WOKDeliv_DeliveryShared.cxx | 2 +- src/WOKDeliv/WOKDeliv_DeliveryStep.cxx | 36 ++++++++++---------- src/WOKDeliv/WOKDeliv_DeliveryStepList.cxx | 6 ++-- src/WOKDeliv/WOKDeliv_ParseDelivery.cxx | 24 ++++++------- 19 files changed, 94 insertions(+), 94 deletions(-) diff --git a/src/WOKDeliv/WOKDeliv_DelivBuildArchive.cxx b/src/WOKDeliv/WOKDeliv_DelivBuildArchive.cxx index a77fa7a..a762c9d 100755 --- a/src/WOKDeliv/WOKDeliv_DelivBuildArchive.cxx +++ b/src/WOKDeliv/WOKDeliv_DelivBuildArchive.cxx @@ -178,7 +178,7 @@ Standard_Boolean WOKDeliv_DelivBuildArchive::BuildArchive break; case WOKBuilder_Failed: ashell->UnLock(); - ErrorMsg << "WOKStep_ArchiveLibrary" + ErrorMsg() << "WOKStep_ArchiveLibrary" << "Failed : " << libpath->Name() << endm; return Standard_False; default: break; diff --git a/src/WOKDeliv/WOKDeliv_DelivBuildExec.cxx b/src/WOKDeliv/WOKDeliv_DelivBuildExec.cxx index 30de105..a7cfc59 100755 --- a/src/WOKDeliv/WOKDeliv_DelivBuildExec.cxx +++ b/src/WOKDeliv/WOKDeliv_DelivBuildExec.cxx @@ -116,7 +116,7 @@ Standard_Boolean WOKDeliv_DelivBuildExec::MakeldFile Handle(EDL_API) anapi = new EDL_API(); if (anapi->OpenFile("MYFILE",resfileld->Path()->Name()->ToCString()) != EDL_NORMAL) { - ErrorMsg << "WOKDeliv_DelivBuilExec::Execute" + ErrorMsg() << "WOKDeliv_DelivBuilExec::Execute" << "Cannot open file " << resfileld->Path()->Name() << endm; okexec = Standard_False; } @@ -236,9 +236,9 @@ Handle(TColStd_HSequenceOfHAsciiString) WOKDeliv_DelivBuildExec::VisibleParcels( thedeliv->Open(); Handle(TCollection_HAsciiString) allreq = thedeliv->EvalParameter("AllRequisites",Standard_False); if (allreq.IsNull()) { - WarningMsg << "WOKDeliv_DelivBuildExec::VisibleParcels" + WarningMsg() << "WOKDeliv_DelivBuildExec::VisibleParcels" << "Unable to get dependencies from parcel : << theparcel->Name()->ToCString()" << endm; - WarningMsg << "WOKDeliv_DelivBuildExec::VisibleParcels" + WarningMsg() << "WOKDeliv_DelivBuildExec::VisibleParcels" << "Missing parameter AllRequisites" << endm; } else { @@ -256,7 +256,7 @@ Handle(TColStd_HSequenceOfHAsciiString) WOKDeliv_DelivBuildExec::VisibleParcels( } } else { - ErrorMsg << "WOKDeliv_DelivBuildExec::VisibleParcels" + ErrorMsg() << "WOKDeliv_DelivBuildExec::VisibleParcels" << " Unable to get delivery " << deliv << " from parcel " << theparcel->Name() << endm; } diff --git a/src/WOKDeliv/WOKDeliv_DelivBuildSource.cxx b/src/WOKDeliv/WOKDeliv_DelivBuildSource.cxx index cd0126f..ff72e78 100755 --- a/src/WOKDeliv/WOKDeliv_DelivBuildSource.cxx +++ b/src/WOKDeliv/WOKDeliv_DelivBuildSource.cxx @@ -33,7 +33,7 @@ void WOKDeliv_DelivBuildSource::Execute(const Handle(WOKMake_HSequenceOfInputFil Handle(TCollection_HAsciiString) unitname = SubCode(); Handle(WOKernel_DevUnit) thesourceunit = Locator()->LocateDevUnit(unitname); if (thesourceunit.IsNull()) { - ErrorMsg << "WOKDeliv_DelivBuildSource" + ErrorMsg() << "WOKDeliv_DelivBuildSource" << "Enable to locate unit " << unitname << endm; SetFailed(); } @@ -65,7 +65,7 @@ void WOKDeliv_DelivBuildSource::Execute(const Handle(WOKMake_HSequenceOfInputFil case WOKUtils_Unknown: case WOKUtils_NotSetted: { - ErrorMsg << "WOKDeliv_DelivBuildSource::Execute" + ErrorMsg() << "WOKDeliv_DelivBuildSource::Execute" << "Unable to execute source on unit " << unitname << endm; SetFailed(); } @@ -73,7 +73,7 @@ void WOKDeliv_DelivBuildSource::Execute(const Handle(WOKMake_HSequenceOfInputFil case WOKUtils_Succeeded: { WOK_TRACE { - VerboseMsg("WOK_DELIV") << "WOKDeliv_DelivBuildSource::Execute" + VerboseMsg()("WOK_DELIV") << "WOKDeliv_DelivBuildSource::Execute" << "File " << result << " created." << endm; } Handle(WOKUtils_Path) pathres = new WOKUtils_Path(result); @@ -96,7 +96,7 @@ void WOKDeliv_DelivBuildSource::Execute(const Handle(WOKMake_HSequenceOfInputFil } break; case WOKUtils_Failed: - ErrorMsg << "WOKDeliv_DelivBuildSource::Execute" + ErrorMsg() << "WOKDeliv_DelivBuildSource::Execute" << "Failed to execute source on unit " << unitname << endm; SetFailed(); break; diff --git a/src/WOKDeliv/WOKDeliv_DeliveryBase.cxx b/src/WOKDeliv/WOKDeliv_DeliveryBase.cxx index b13c525..5c89860 100755 --- a/src/WOKDeliv/WOKDeliv_DeliveryBase.cxx +++ b/src/WOKDeliv/WOKDeliv_DeliveryBase.cxx @@ -45,14 +45,14 @@ void WOKDeliv_DeliveryBase::Execute(const Handle(WOKMake_HSequenceOfInputFile)&) Standard_Boolean okexec = Standard_True; if (!myList.IsNull()) { - InfoMsg << "WOKDeliv_DeliveryBase" << "Process UL : " << myList->GetName()->ToCString() << endm; + InfoMsg() << "WOKDeliv_DeliveryBase" << "Process UL : " << myList->GetName()->ToCString() << endm; Handle(TCollection_HAsciiString) thename = myList->GetName(); Handle(WOKernel_Warehouse) theWarehouse; Handle(WOKernel_Session) theSession = Unit()->Session(); Handle(WOKernel_Parcel) theParcel = GetParcel(Unit(),thename); if (!theParcel.IsNull()) { - InfoMsg << "WOKDeliv_DeliveryBase" << "Parcel already created : update" << endm; + InfoMsg() << "WOKDeliv_DeliveryBase" << "Parcel already created : update" << endm; theParcel->Open(); theWarehouse = theSession->GetWarehouse(theParcel->Nesting()); } @@ -105,7 +105,7 @@ void WOKDeliv_DeliveryBase::Execute(const Handle(WOKMake_HSequenceOfInputFile)&) Handle(WOKMake_InputFile) infileCOMPONENTS = GetInFileCOMPONENTS(); if (infileCOMPONENTS.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryBase::Execute" + ErrorMsg() << "WOKDeliv_DeliveryBase::Execute" << "Missing File COMPONENTS, Check file FILES" << endm; SetFailed(); return; @@ -122,7 +122,7 @@ void WOKDeliv_DeliveryBase::Execute(const Handle(WOKMake_HSequenceOfInputFile)&) Handle(TCollection_HAsciiString) delivfilename = DELIVERIESFile->Path()->Name(); ofstream delstream(delivfilename->ToCString(), ios::out); if (!delstream) { - ErrorMsg << "WOKDeliv_DeliveryBase::Execute" << "Could not open " << delivfilename->ToCString() << endm; + ErrorMsg() << "WOKDeliv_DeliveryBase::Execute" << "Could not open " << delivfilename->ToCString() << endm; SetFailed(); okexec = Standard_False; } @@ -199,7 +199,7 @@ void WOKDeliv_DeliveryBase::Execute(const Handle(WOKMake_HSequenceOfInputFile)&) Handle(TCollection_HAsciiString) namedepulfilename = depulFile->Path()->Name(); ofstream depulstream(namedepulfilename->ToCString(), ios::out); if (!depulstream) { - ErrorMsg << "WOKDeliv_DeliveryBase::Execute" << "Could not open " << namedepulfilename->ToCString() << endm; + ErrorMsg() << "WOKDeliv_DeliveryBase::Execute" << "Could not open " << namedepulfilename->ToCString() << endm; SetFailed(); okexec = Standard_False; } @@ -326,7 +326,7 @@ void WOKDeliv_DeliveryBase::Execute(const Handle(WOKMake_HSequenceOfInputFile)&) Handle(TCollection_HAsciiString) namefilename = NAMEFile->Path()->Name(); ofstream namestream(namefilename->ToCString(), ios::out); if (!namestream) { - ErrorMsg << "WOKDeliv_DeliveryBase::Execute" << "Could not open " << namefilename->ToCString() << endm; + ErrorMsg() << "WOKDeliv_DeliveryBase::Execute" << "Could not open " << namefilename->ToCString() << endm; SetFailed(); okexec = Standard_False; } @@ -354,7 +354,7 @@ void WOKDeliv_DeliveryBase::Execute(const Handle(WOKMake_HSequenceOfInputFile)&) while (itpck.More()) { Handle(WOKernel_DevUnit) thesourceunit = Locator()->LocateDevUnit(itpck.Key()); if (thesourceunit.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryBase::Execute" << "cannot locate unit : " << itpck.Key()->ToCString() << endm; + ErrorMsg() << "WOKDeliv_DeliveryBase::Execute" << "cannot locate unit : " << itpck.Key()->ToCString() << endm; SetFailed(); okexec = Standard_False; } diff --git a/src/WOKDeliv/WOKDeliv_DeliveryCopy.cxx b/src/WOKDeliv/WOKDeliv_DeliveryCopy.cxx index fb5ab63..f41c4ff 100755 --- a/src/WOKDeliv/WOKDeliv_DeliveryCopy.cxx +++ b/src/WOKDeliv/WOKDeliv_DeliveryCopy.cxx @@ -76,7 +76,7 @@ void WOKDeliv_DeliveryCopy::Execute(const Handle(WOKMake_HSequenceOfInputFile)& } } else { - ErrorMsg << "WOKDeliv_DeliveryCopy::Execute" << "Cannot find delivery : " << myList->GetName()->ToCString() << endm; + ErrorMsg() << "WOKDeliv_DeliveryCopy::Execute" << "Cannot find delivery : " << myList->GetName()->ToCString() << endm; } } if (okexec) { diff --git a/src/WOKDeliv/WOKDeliv_DeliveryDATA.cxx b/src/WOKDeliv/WOKDeliv_DeliveryDATA.cxx index ea3b739..7cad074 100755 --- a/src/WOKDeliv/WOKDeliv_DeliveryDATA.cxx +++ b/src/WOKDeliv/WOKDeliv_DeliveryDATA.cxx @@ -63,7 +63,7 @@ Standard_Boolean WOKDeliv_DeliveryDATA::ExecuteMetaStep() Handle(WOKernel_DevUnit) thesourceunit = Locator()->LocateDevUnit(itpck.Key()); if (thesourceunit.IsNull()) { okexec = Standard_False; - ErrorMsg << "WOKDeliv_DeliveryDATA::Execute" << "Cannot locate unit : " << itpck.Key()->ToCString() << endm; + ErrorMsg() << "WOKDeliv_DeliveryDATA::Execute" << "Cannot locate unit : " << itpck.Key()->ToCString() << endm; } else { if (WOKernel_IsFrontal(thesourceunit)) { @@ -114,7 +114,7 @@ Standard_Boolean WOKDeliv_DeliveryDATA::ExecuteSubStep() Handle(WOKernel_DevUnit) thesourceunit = Locator()->LocateDevUnit(SubCode()); if (thesourceunit.IsNull()) { okexec = Standard_False; - ErrorMsg << "WOKDeliv_DeliveryDATA::Execute" + ErrorMsg() << "WOKDeliv_DeliveryDATA::Execute" << "Cannot locate unit : " << SubCode() << endm; } else { @@ -143,7 +143,7 @@ Standard_Boolean WOKDeliv_DeliveryDATA::ExecuteSubStep() Handle(EDL_API) anapi = new EDL_API(); anapi->AddVariable("%MYVAR",reseval->ToCString()); if (anapi->OpenFile("MYFILE",filescript->Path()->Name()->ToCString()) != EDL_NORMAL) { - ErrorMsg << "WOKDeliv_DeliveryDATA::Execute" + ErrorMsg() << "WOKDeliv_DeliveryDATA::Execute" << "Cannot open file " << filescript->Path()->Name() << endm; okexec = Standard_False; } @@ -188,7 +188,7 @@ Standard_Boolean WOKDeliv_DeliveryDATA::ExecuteSubStep() anapi->AddVariable("%MYVAR",reseval->ToCString()); if (anapi->OpenFile("MYFILECCL",filescript->Path()->Name()->ToCString()) != EDL_NORMAL) { - ErrorMsg << "WOKDeliv_DeliveryDATA::Execute" + ErrorMsg() << "WOKDeliv_DeliveryDATA::Execute" << "Cannot open file " << filescript->Path()->Name() << endm; okexec = Standard_False; } @@ -219,7 +219,7 @@ Standard_Boolean WOKDeliv_DeliveryDATA::ExecuteSubStep() anapi->AddVariable("%MYVAR",bineval->ToCString()); if (anapi->OpenFile("MYFILEBIN",filescript->Path()->Name()->ToCString()) != EDL_NORMAL) { - ErrorMsg << "WOKDeliv_DeliveryDATA::Execute" + ErrorMsg() << "WOKDeliv_DeliveryDATA::Execute" << "Cannot open file " << filescript->Path()->Name() << endm; okexec = Standard_False; } @@ -250,7 +250,7 @@ Standard_Boolean WOKDeliv_DeliveryDATA::ExecuteSubStep() } Handle(WOKMake_HSequenceOfOutputFile) thefiles = thestep->OutputFileList(); if (thefiles.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryDATA::Execute" + ErrorMsg() << "WOKDeliv_DeliveryDATA::Execute" << "Step " << namestep << " not done for unit " << thesourceunit->Name() << endm; okexec = Standard_False; } diff --git a/src/WOKDeliv/WOKDeliv_DeliveryExecList.cxx b/src/WOKDeliv/WOKDeliv_DeliveryExecList.cxx index f9f806d..b32d2be 100755 --- a/src/WOKDeliv/WOKDeliv_DeliveryExecList.cxx +++ b/src/WOKDeliv/WOKDeliv_DeliveryExecList.cxx @@ -97,7 +97,7 @@ Standard_Boolean WOKDeliv_DeliveryExecList::ExecuteMetaStep() Handle(WOKernel_DevUnit) thesourceunit = Locator()->LocateDevUnit(itpck.Key()); if (thesourceunit.IsNull()) { okexec = Standard_False; - ErrorMsg << "WOKDeliv_DeliveryLIB::Execute" << "Cannot locate unit : " << itpck.Key()->ToCString() << endm; + ErrorMsg() << "WOKDeliv_DeliveryLIB::Execute" << "Cannot locate unit : " << itpck.Key()->ToCString() << endm; } else { if (IsAvailable(thesourceunit)) { @@ -123,14 +123,14 @@ Standard_Boolean WOKDeliv_DeliveryExecList::TreatDynamic() Handle(WOKernel_DevUnit) thesourceunit = Locator()->LocateDevUnit(nameunit); if (thesourceunit.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryExecList::Execute" + ErrorMsg() << "WOKDeliv_DeliveryExecList::Execute" << "Cannot locate DevUnit : " << nameunit << endm; return Standard_False; } thesourceunit->Open(); Handle(TCollection_HAsciiString) name = SubCode()->Token("_",2); WOK_TRACE { - VerboseMsg("WOK_DELIV") << "WOKDeliv_DeliveryExecList" + VerboseMsg()("WOK_DELIV") << "WOKDeliv_DeliveryExecList" << "Treating : " << nameunit << " exec : " << name << endm; } @@ -150,12 +150,12 @@ Standard_Boolean WOKDeliv_DeliveryExecList::TreatDynamic() } if (thestep.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryExecList::TreatDynamic" + ErrorMsg() << "WOKDeliv_DeliveryExecList::TreatDynamic" << "Enable to find linking step for unit : " << nameunit; if (!name.IsNull()) { - ErrorMsg << " for executable : " << name; + ErrorMsg() << " for executable : " << name; } - ErrorMsg << endm; + ErrorMsg() << endm; return Standard_False; } @@ -191,7 +191,7 @@ Standard_Boolean WOKDeliv_DeliveryExecList::CompleteEngine() Handle(TCollection_HAsciiString) nameunit = SubCode()->Token("_",1); Handle(WOKernel_DevUnit) thesourceunit = Locator()->LocateDevUnit(nameunit); if (thesourceunit.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryExecList::Execute" + ErrorMsg() << "WOKDeliv_DeliveryExecList::Execute" << "Cannot locate DevUnit : " << nameunit << endm; return Standard_False; } @@ -203,13 +203,13 @@ Standard_Boolean WOKDeliv_DeliveryExecList::CompleteEngine() namedat, Handle(TCollection_HAsciiString) ()); if (thestep.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryExecList::Execute" + ErrorMsg() << "WOKDeliv_DeliveryExecList::Execute" << "Step " << namedat << " not done for unit " << nameunit << endm; return Standard_False; } Handle(WOKMake_HSequenceOfOutputFile) thefiles = thestep->OutputFileList(); if (thefiles.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryExecList::Execute" + ErrorMsg() << "WOKDeliv_DeliveryExecList::Execute" << "Step " << namedat << " unprocessed for unit " << nameunit << endm; return Standard_False; } @@ -238,13 +238,13 @@ Standard_Boolean WOKDeliv_DeliveryExecList::CompleteEngine() namell, Handle(TCollection_HAsciiString) ()); if (thestep.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryExecList::Execute" + ErrorMsg() << "WOKDeliv_DeliveryExecList::Execute" << "Step " << namell << " not done for unit " << nameunit << endm; return Standard_False; } thefiles = thestep->OutputFileList(); if (thefiles.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryExecList::Execute" + ErrorMsg() << "WOKDeliv_DeliveryExecList::Execute" << "Step " << namell << " unprocessed for unit " << nameunit << endm; return Standard_False; } @@ -289,7 +289,7 @@ Standard_Boolean WOKDeliv_DeliveryExecList::ExploreMetaStep(const Handle(WOKerne namesexec, Handle(TCollection_HAsciiString) ()); if (themstep.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryExecList::Execute" + ErrorMsg() << "WOKDeliv_DeliveryExecList::Execute" << "Cannot find linking step for DevUnit : " << thesourceunit->Name() << endm; return Standard_False; } @@ -306,7 +306,7 @@ Standard_Boolean WOKDeliv_DeliveryExecList::ExploreMetaStep(const Handle(WOKerne namesexec, Handle(TCollection_HAsciiString) ()); if (theexecstep.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryExecList::Execute" + ErrorMsg() << "WOKDeliv_DeliveryExecList::Execute" << "Cannot find linking step for DevUnit : " << thesourceunit->Name() << endm; return Standard_False; } diff --git a/src/WOKDeliv/WOKDeliv_DeliveryFiles.cxx b/src/WOKDeliv/WOKDeliv_DeliveryFiles.cxx index c4073ac..6fc85da 100755 --- a/src/WOKDeliv/WOKDeliv_DeliveryFiles.cxx +++ b/src/WOKDeliv/WOKDeliv_DeliveryFiles.cxx @@ -90,7 +90,7 @@ void WOKDeliv_DeliveryFiles::Execute(const Handle(WOKMake_HSequenceOfInputFile)& } } else { - ErrorMsg << "WOKDeliv_DeliveryFiles::Execute" << "Cannot find delivery : " << myList->GetName()->ToCString() << endm; + ErrorMsg() << "WOKDeliv_DeliveryFiles::Execute" << "Cannot find delivery : " << myList->GetName()->ToCString() << endm; } } if (okexec) { diff --git a/src/WOKDeliv/WOKDeliv_DeliveryGET.cxx b/src/WOKDeliv/WOKDeliv_DeliveryGET.cxx index a4dc1f0..7db7572 100755 --- a/src/WOKDeliv/WOKDeliv_DeliveryGET.cxx +++ b/src/WOKDeliv/WOKDeliv_DeliveryGET.cxx @@ -53,7 +53,7 @@ void WOKDeliv_DeliveryGET::Execute(const Handle(WOKMake_HSequenceOfInputFile)&) while (itget.More()) { Handle(WOKernel_File) thefile = Locator()->Locate(itget.Key()); if (thefile.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryGET::Execute" + ErrorMsg() << "WOKDeliv_DeliveryGET::Execute" << "cannot locate file " << itget.Key() << endm; okexec = Standard_False; } @@ -105,7 +105,7 @@ void WOKDeliv_DeliveryGET::Execute(const Handle(WOKMake_HSequenceOfInputFile)&) if (first <= 1) { Handle(TCollection_HAsciiString) filenameFILES = thesourceunit->Params().Eval("%FILENAME_FILES"); if (strcmp(filenameFILES->ToCString(),astr->ToCString())) { - ErrorMsg << "WOKDeliv_DeliveryGET::Execute" + ErrorMsg() << "WOKDeliv_DeliveryGET::Execute" << "No type specified for file " << astr << " in unit " << thesourceunit->Name() << endm; okexec = Standard_False; } @@ -116,7 +116,7 @@ void WOKDeliv_DeliveryGET::Execute(const Handle(WOKMake_HSequenceOfInputFile)&) Handle(WOKernel_File) thefile = Locator()->Locate(thesourceunit->Name(),type,name); if (thefile.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryGET::Execute" + ErrorMsg() << "WOKDeliv_DeliveryGET::Execute" << "cannot locate file " << name << endm; okexec = Standard_False; } @@ -137,7 +137,7 @@ void WOKDeliv_DeliveryGET::Execute(const Handle(WOKMake_HSequenceOfInputFile)&) } } else { - ErrorMsg << "WOKDeliv_DeliveryGET::Execute" << "cannot find file FILES in resource unit " << thesourceunit->Name() << endm; + ErrorMsg() << "WOKDeliv_DeliveryGET::Execute" << "cannot find file FILES in resource unit " << thesourceunit->Name() << endm; okexec = Standard_False; } } diff --git a/src/WOKDeliv/WOKDeliv_DeliveryLIB.cxx b/src/WOKDeliv/WOKDeliv_DeliveryLIB.cxx index 6d17997..caf0543 100755 --- a/src/WOKDeliv/WOKDeliv_DeliveryLIB.cxx +++ b/src/WOKDeliv/WOKDeliv_DeliveryLIB.cxx @@ -50,7 +50,7 @@ void WOKDeliv_DeliveryLIB::Execute(const Handle(WOKMake_HSequenceOfInputFile)&) Handle(WOKernel_DevUnit) thesourceunit = Locator()->LocateDevUnit(itpck.Key()); if (thesourceunit.IsNull()) { okexec = Standard_False; - ErrorMsg << "WOKDeliv_DeliveryLIB::Execute" << "Cannot locate unit : " << itpck.Key()->ToCString() << endm; + ErrorMsg() << "WOKDeliv_DeliveryLIB::Execute" << "Cannot locate unit : " << itpck.Key()->ToCString() << endm; } else { if (IsAvailable(thesourceunit)) { @@ -98,7 +98,7 @@ void WOKDeliv_DeliveryLIB::Execute(const Handle(WOKMake_HSequenceOfInputFile)&) Handle(WOKernel_DevUnit) thesourceunit = Locator()->LocateDevUnit(SubCode()); if (thesourceunit.IsNull()) { okexec = Standard_False; - ErrorMsg << "WOKDeliv_DeliveryLIB::Execute" << "Cannot locate unit : " << SubCode() << endm; + ErrorMsg() << "WOKDeliv_DeliveryLIB::Execute" << "Cannot locate unit : " << SubCode() << endm; } else { // Find file ImplDep @@ -130,7 +130,7 @@ void WOKDeliv_DeliveryLIB::Execute(const Handle(WOKMake_HSequenceOfInputFile)&) PACKAGESname); if (filepack.IsNull()) { okexec = Standard_False; - ErrorMsg << "WOKDeliv_DeliveryLIB::Execute" + ErrorMsg() << "WOKDeliv_DeliveryLIB::Execute" << "Cannot locate file PACKAGES for Toolkit " << thesourceunit->Name() << endm; } @@ -201,7 +201,7 @@ void WOKDeliv_DeliveryLIB::Execute(const Handle(WOKMake_HSequenceOfInputFile)&) } } else { - ErrorMsg << "WOKDeliv_DeliveryCDL::Execute" << "Cannot find delivery : " << myList->GetName()->ToCString() << endm; + ErrorMsg() << "WOKDeliv_DeliveryCDL::Execute" << "Cannot find delivery : " << myList->GetName()->ToCString() << endm; } } @@ -250,7 +250,7 @@ void WOKDeliv_DeliveryLIB::TreatStep(const Handle(WOKMake_Step)& thestep, else { Handle(WOKMake_HSequenceOfOutputFile) thefiles = thestep->OutputFileList(); if (thefiles.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryLIB::Execute" + ErrorMsg() << "WOKDeliv_DeliveryLIB::Execute" << "Step " << thestep->Code() << " unprocessed for unit " << thestep->Unit()->Name() << endm; } @@ -258,7 +258,7 @@ void WOKDeliv_DeliveryLIB::TreatStep(const Handle(WOKMake_Step)& thestep, for (Standard_Integer i=1; i<= thefiles->Length(); i++) { Handle(WOKernel_File) theinfile = thefiles->Value(i)->File(); if (theinfile.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryLIB::Execute" + ErrorMsg() << "WOKDeliv_DeliveryLIB::Execute" << "Null file for output file : " << thefiles->Value(i)->ID() << endm; } else { diff --git a/src/WOKDeliv/WOKDeliv_DeliveryListShared.cxx b/src/WOKDeliv/WOKDeliv_DeliveryListShared.cxx index ebd5b76..22cac28 100755 --- a/src/WOKDeliv/WOKDeliv_DeliveryListShared.cxx +++ b/src/WOKDeliv/WOKDeliv_DeliveryListShared.cxx @@ -74,7 +74,7 @@ void WOKDeliv_DeliveryListShared::Execute(const Handle(WOKMake_HSequenceOfInputF PACKAGESname); if (filepack.IsNull()) { okexec = Standard_False; - ErrorMsg << "WOKDeliv_DeliveryListShared::Execute" + ErrorMsg() << "WOKDeliv_DeliveryListShared::Execute" << "Cannot locate file PACKAGES for Toolkit " << thesourceunit->Name() << endm; } diff --git a/src/WOKDeliv/WOKDeliv_DeliveryMetaStep.cxx b/src/WOKDeliv/WOKDeliv_DeliveryMetaStep.cxx index 299c3e7..871d516 100755 --- a/src/WOKDeliv/WOKDeliv_DeliveryMetaStep.cxx +++ b/src/WOKDeliv/WOKDeliv_DeliveryMetaStep.cxx @@ -71,12 +71,12 @@ Handle(WOKDeliv_DeliveryList) WOKDeliv_DeliveryMetaStep::ParseCOMPONENTS(const S WOKDeliv_Delivery_CloseFile(); } else { - ErrorMsg << "WOKDeliv_DeliveryMetaStep::Parse" << "Error getting file COMPONENTS" << endm; + ErrorMsg() << "WOKDeliv_DeliveryMetaStep::Parse" << "Error getting file COMPONENTS" << endm; SetFailed(); } } else { - ErrorMsg << "WOKDeliv_DeliveryMetaStep::Parse" << "Error locating file COMPONENTS" << endm; + ErrorMsg() << "WOKDeliv_DeliveryMetaStep::Parse" << "Error locating file COMPONENTS" << endm; SetFailed(); } return dlist; diff --git a/src/WOKDeliv/WOKDeliv_DeliveryOBJSSchema.cxx b/src/WOKDeliv/WOKDeliv_DeliveryOBJSSchema.cxx index 435b9a2..76f56b1 100755 --- a/src/WOKDeliv/WOKDeliv_DeliveryOBJSSchema.cxx +++ b/src/WOKDeliv/WOKDeliv_DeliveryOBJSSchema.cxx @@ -46,7 +46,7 @@ void WOKDeliv_DeliveryOBJSSchema::Execute(const Handle(WOKMake_HSequenceOfInputF Handle(WOKernel_DevUnit) thesourceunit = Locator()->LocateDevUnit(itpck.Key()); if (thesourceunit.IsNull()) { okexec = Standard_False; - ErrorMsg << "WOKDeliv_DeliveryOBJSSchema::Execute" << "Cannot locate unit : " << itpck.Key()->ToCString() << endm; + ErrorMsg() << "WOKDeliv_DeliveryOBJSSchema::Execute" << "Cannot locate unit : " << itpck.Key()->ToCString() << endm; SetFailed(); } else { @@ -58,7 +58,7 @@ void WOKDeliv_DeliveryOBJSSchema::Execute(const Handle(WOKMake_HSequenceOfInputF if (!thestep.IsNull()) { Handle(WOKMake_HSequenceOfOutputFile) thefiles = thestep->OutputFileList(); if (thefiles.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryOBJSSchema::Execute" + ErrorMsg() << "WOKDeliv_DeliveryOBJSSchema::Execute" << "Step " << namestep << " not done for unit " << thesourceunit->Name() << endm; okexec = Standard_False; } @@ -86,7 +86,7 @@ void WOKDeliv_DeliveryOBJSSchema::Execute(const Handle(WOKMake_HSequenceOfInputF } } else { - ErrorMsg << "WOKDeliv_DeliveryOBJSSchema::Execute" << "Cannot find delivery : " << myList->GetName()->ToCString() << endm; + ErrorMsg() << "WOKDeliv_DeliveryOBJSSchema::Execute" << "Cannot find delivery : " << myList->GetName()->ToCString() << endm; okexec = Standard_False; } } diff --git a/src/WOKDeliv/WOKDeliv_DeliverySOURCES.cxx b/src/WOKDeliv/WOKDeliv_DeliverySOURCES.cxx index 5b90f14..f37307c 100755 --- a/src/WOKDeliv/WOKDeliv_DeliverySOURCES.cxx +++ b/src/WOKDeliv/WOKDeliv_DeliverySOURCES.cxx @@ -60,7 +60,7 @@ Standard_Boolean WOKDeliv_DeliverySOURCES::ExecuteMetaStep() Handle(WOKernel_DevUnit) thesourceunit = Locator()->LocateDevUnit(itpck.Key()); if (thesourceunit.IsNull()) { okexec = Standard_False; - ErrorMsg << "WOKDeliv_DeliverySOURCE::Execute" << "Cannot locate unit : " << itpck.Key()->ToCString() << endm; + ErrorMsg() << "WOKDeliv_DeliverySOURCE::Execute" << "Cannot locate unit : " << itpck.Key()->ToCString() << endm; } else { thesourceunit->Open(); @@ -109,7 +109,7 @@ Standard_Boolean WOKDeliv_DeliverySOURCES::ExecuteSubStep() Handle(WOKernel_DevUnit) thesourceunit = Locator()->LocateDevUnit(SubCode()); if (thesourceunit.IsNull()) { okexec = Standard_False; - ErrorMsg << "WOKDeliv_DeliverySOURCE::Execute" << "Cannot locate unit : " << SubCode() << endm; + ErrorMsg() << "WOKDeliv_DeliverySOURCE::Execute" << "Cannot locate unit : " << SubCode() << endm; } else { Handle(WOKMake_InputFile) infileCOMPONENTS = GetInFileCOMPONENTS(); @@ -134,7 +134,7 @@ Standard_Boolean WOKDeliv_DeliverySOURCES::ExecuteSubStep() atype, aname); if (afile.IsNull()) { - ErrorMsg << "WOKDeliv_DeliverySOURCE::Execute" + ErrorMsg() << "WOKDeliv_DeliverySOURCE::Execute" << "Enable to locate source file " << astr << endm; okexec = Standard_False; } diff --git a/src/WOKDeliv/WOKDeliv_DeliverySTUBClient.cxx b/src/WOKDeliv/WOKDeliv_DeliverySTUBClient.cxx index 62b2825..7bfca67 100755 --- a/src/WOKDeliv/WOKDeliv_DeliverySTUBClient.cxx +++ b/src/WOKDeliv/WOKDeliv_DeliverySTUBClient.cxx @@ -43,7 +43,7 @@ void WOKDeliv_DeliverySTUBClient::Execute(const Handle(WOKMake_HSequenceOfInputF Handle(WOKernel_DevUnit) thesourceunit = Locator()->LocateDevUnit(itpck.Key()); if (thesourceunit.IsNull()) { okexec = Standard_False; - ErrorMsg << "WOKDeliv_DeliverySTUBClient::Execute" << "Cannot locate unit : " << itpck.Key()->ToCString() << endm; + ErrorMsg() << "WOKDeliv_DeliverySTUBClient::Execute" << "Cannot locate unit : " << itpck.Key()->ToCString() << endm; } else { if (WOKernel_IsClient(thesourceunit)) { @@ -87,7 +87,7 @@ void WOKDeliv_DeliverySTUBClient::Execute(const Handle(WOKMake_HSequenceOfInputF Handle(WOKernel_DevUnit) thesourceunit = Locator()->LocateDevUnit(SubCode()); if (thesourceunit.IsNull()) { okexec = Standard_False; - ErrorMsg << "WOKDeliv_DeliveryClient::Execute" << "Cannot locate unit : " << SubCode() << endm; + ErrorMsg() << "WOKDeliv_DeliveryClient::Execute" << "Cannot locate unit : " << SubCode() << endm; } else { Handle(WOKBuilder_Entity) bidon; @@ -116,7 +116,7 @@ void WOKDeliv_DeliverySTUBClient::Execute(const Handle(WOKMake_HSequenceOfInputF if (!thestep.IsNull()) { Handle(WOKMake_HSequenceOfOutputFile) thefiles = thestep->OutputFileList(); if (thefiles.IsNull()) { - ErrorMsg << "WOKDeliv_DeliverySTUBClient::Execute" + ErrorMsg() << "WOKDeliv_DeliverySTUBClient::Execute" << "Step " << namestep << " not done for unit " << thesourceunit->Name() << endm; okexec = Standard_False; } @@ -142,7 +142,7 @@ void WOKDeliv_DeliverySTUBClient::Execute(const Handle(WOKMake_HSequenceOfInputF } } else { - ErrorMsg << "WOKDeliv_DeliverySTUBClient::Execute" << "Cannot find delivery : " << myList->GetName()->ToCString() << endm; + ErrorMsg() << "WOKDeliv_DeliverySTUBClient::Execute" << "Cannot find delivery : " << myList->GetName()->ToCString() << endm; okexec = Standard_False; } } diff --git a/src/WOKDeliv/WOKDeliv_DeliveryShared.cxx b/src/WOKDeliv/WOKDeliv_DeliveryShared.cxx index 30d6641..640614f 100755 --- a/src/WOKDeliv/WOKDeliv_DeliveryShared.cxx +++ b/src/WOKDeliv/WOKDeliv_DeliveryShared.cxx @@ -66,7 +66,7 @@ void WOKDeliv_DeliveryShared::ComputeOutputLIB(const Handle(WOKernel_DevUnit)& t if (!thestep.IsNull()) { Handle(WOKMake_HSequenceOfOutputFile) thefiles = thestep->OutputFileList(); if (thefiles.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryShared::Execute" + ErrorMsg() << "WOKDeliv_DeliveryShared::Execute" << "Step " << thestep->Code() << " unprocessed for unit " << thesourceunit->Name() << endm; } diff --git a/src/WOKDeliv/WOKDeliv_DeliveryStep.cxx b/src/WOKDeliv/WOKDeliv_DeliveryStep.cxx index fe64d10..10f4abb 100755 --- a/src/WOKDeliv/WOKDeliv_DeliveryStep.cxx +++ b/src/WOKDeliv/WOKDeliv_DeliveryStep.cxx @@ -77,12 +77,12 @@ Handle(WOKDeliv_DeliveryList) WOKDeliv_DeliveryStep::ParseCOMPONENTS(const Stand WOKDeliv_Delivery_CloseFile(); } else { - ErrorMsg << "WOKDeliv_DeliveryStep::Parse" << "Error getting file COMPONENTS" << endm; + ErrorMsg() << "WOKDeliv_DeliveryStep::Parse" << "Error getting file COMPONENTS" << endm; SetFailed(); } } else { - ErrorMsg << "WOKDeliv_DeliveryStep::Parse" << "Error locating file COMPONENTS" << endm; + ErrorMsg() << "WOKDeliv_DeliveryStep::Parse" << "Error locating file COMPONENTS" << endm; SetFailed(); } return dlist; @@ -104,7 +104,7 @@ Standard_Boolean WOKDeliv_DeliveryStep::CopyAFile(const Handle(WOKernel_DevUnit) tocopy = !fromP->IsSameFile(toP); if (!tocopy && !silent) { WOK_TRACE { - VerboseMsg("WOK_DELIV") << "WOKDeliv_DeliveryStep::CopyAFile" + VerboseMsg()("WOK_DELIV") << "WOKDeliv_DeliveryStep::CopyAFile" << "Identical file : " << fromP->Name() << " not copied." << endm; } } @@ -134,17 +134,17 @@ Standard_Boolean WOKDeliv_DeliveryStep::CopyAFile(const Handle(WOKernel_DevUnit) ashell->Execute(thecomm); if (ashell->Status() == 0) { if (!silent) { - InfoMsg << "WOKDeliv_DeliveryStep::CopyAFile" + InfoMsg() << "WOKDeliv_DeliveryStep::CopyAFile" << fromP->Name() << " copied to " << toP->Name() << endm; } ashell->ClearOutput(); return Standard_True; } - ErrorMsg << "WOKDeliv_DeliveryStep::CopyAFile" + ErrorMsg() << "WOKDeliv_DeliveryStep::CopyAFile" << "Error occured in shell while copying " << fromP->Name() << " to " << toP->Name() << endm; Handle(TColStd_HSequenceOfHAsciiString) aseq = ashell->Errors(); for(Standard_Integer i=1; i<= aseq->Length(); i++) { - ErrorMsg << "WOKDeliv_DeliveryStep::CopyAFile" + ErrorMsg() << "WOKDeliv_DeliveryStep::CopyAFile" << aseq->Value(i) << endm; } ashell->ClearOutput(); @@ -213,7 +213,7 @@ Handle(TCollection_HAsciiString) WOKDeliv_DeliveryStep::GetFullParcelName(const Handle(WOKernel_Locator) theloc = DefineLocator(); Handle(WOKernel_DevUnit) theunit = theloc->LocateDevUnit(aname); if (theunit.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryStep::GetFullParcelName" << "cannot locate delivery " << aname->ToCString() << endm; + ErrorMsg() << "WOKDeliv_DeliveryStep::GetFullParcelName" << "cannot locate delivery " << aname->ToCString() << endm; return 0; } Handle(WOKernel_UnitNesting) theNesting = Unit()->Session()->GetUnitNesting(theunit->Nesting()); @@ -255,7 +255,7 @@ Handle(WOKernel_Locator) WOKDeliv_DeliveryStep::DefineLocator() } } else { - ErrorMsg << "WOKDeliv_DeliveryStep::DefineLocator" << "Error while parsing file COMPONENTS for unit " << theunit->Name()->ToCString() << endm; + ErrorMsg() << "WOKDeliv_DeliveryStep::DefineLocator" << "Error while parsing file COMPONENTS for unit " << theunit->Name()->ToCString() << endm; } } } @@ -321,7 +321,7 @@ Standard_Boolean WOKDeliv_DeliveryStep::HandleOutputFile(const Handle(WOKMake_Ou Handle(WOKUtils_Path) oldpath = afile->LastPath(); if (oldpath.IsNull()) return Standard_False; oldpath->RemoveFile(); - InfoMsg << "WOKDeliv_DeliveryStep" + InfoMsg() << "WOKDeliv_DeliveryStep" << "Remove file " << oldpath->Name() << endm; return Standard_True; @@ -351,7 +351,7 @@ Standard_Boolean WOKDeliv_DeliveryStep::HandleOutputFile(const Handle(WOKMake_Ou if(atempl.IsNull()) { - WarningMsg << "WOKDeliv_DeliveryStep::HandleOutputFile" + WarningMsg() << "WOKDeliv_DeliveryStep::HandleOutputFile" << "Could not determine Del action for type : " << afile->File()->TypeName() << endm; ashell->UnLock(); return Standard_False; @@ -359,7 +359,7 @@ Standard_Boolean WOKDeliv_DeliveryStep::HandleOutputFile(const Handle(WOKMake_Ou if(! Unit()->Params().IsSet(atempl->ToCString())) { - ErrorMsg << "WOKDeliv_DeliveryStep::HandleOutputFile" + ErrorMsg() << "WOKDeliv_DeliveryStep::HandleOutputFile" << "Could not eval Del action (" << atempl << ") for type : " << afile->File()->TypeName() << endm; ashell->UnLock(); return Standard_False; @@ -375,7 +375,7 @@ Standard_Boolean WOKDeliv_DeliveryStep::HandleOutputFile(const Handle(WOKMake_Ou if(!acmd.IsNull()) { - InfoMsg << "WOKDeliv_DeliveryStep::HandleOutputFile" + InfoMsg() << "WOKDeliv_DeliveryStep::HandleOutputFile" << "Invoking " << atempl << " on " << afile->File()->Path()->Name() << endm; ashell->Execute(acmd); @@ -383,15 +383,15 @@ Standard_Boolean WOKDeliv_DeliveryStep::HandleOutputFile(const Handle(WOKMake_Ou if(ashell->Status()) { Handle(TColStd_HSequenceOfHAsciiString) resseq = ashell->Errors(); - Standard_Boolean ph = ErrorMsg.PrintHeader(); + Standard_Boolean ph = ErrorMsg().PrintHeader(); - ErrorMsg << "WOKDeliv_DeliveryStep::HandleOutputFile" << "Errors occured in Shell" << endm; - ErrorMsg.DontPrintHeader(); + ErrorMsg() << "WOKDeliv_DeliveryStep::HandleOutputFile" << "Errors occured in Shell" << endm; + ErrorMsg().DontPrintHeader(); for(Standard_Integer i=1; i<= resseq->Length(); i++) { - ErrorMsg << "WOKMake_Step::HandleOutputFile" << resseq->Value(i) << endm; + ErrorMsg() << "WOKMake_Step::HandleOutputFile" << resseq->Value(i) << endm; } - if(ph) ErrorMsg.DoPrintHeader(); + if(ph) ErrorMsg().DoPrintHeader(); } OutLocator()->ChangeRemove(afile->File()); ashell->ClearOutput(); @@ -402,7 +402,7 @@ Standard_Boolean WOKDeliv_DeliveryStep::HandleOutputFile(const Handle(WOKMake_Ou { if(afile->File()->Path()->IsSymLink()) { - WarningMsg << "WOKDeliv_DeliveryStep::HandleOutputFile" + WarningMsg() << "WOKDeliv_DeliveryStep::HandleOutputFile" << "Disappeared File (" << afile->File()->UserPathName() << ") does not exists " << endm; } } diff --git a/src/WOKDeliv/WOKDeliv_DeliveryStepList.cxx b/src/WOKDeliv/WOKDeliv_DeliveryStepList.cxx index 9f12da5..30b3625 100755 --- a/src/WOKDeliv/WOKDeliv_DeliveryStepList.cxx +++ b/src/WOKDeliv/WOKDeliv_DeliveryStepList.cxx @@ -43,7 +43,7 @@ void WOKDeliv_DeliveryStepList::Execute(const Handle(WOKMake_HSequenceOfInputFil Handle(WOKernel_DevUnit) thesourceunit = Locator()->LocateDevUnit(itpck.Key()); if (thesourceunit.IsNull()) { okexec = Standard_False; - ErrorMsg << "WOKDeliv_DeliveryStepList::Execute" << "Cannot locate unit : " << itpck.Key()->ToCString() << endm; + ErrorMsg() << "WOKDeliv_DeliveryStepList::Execute" << "Cannot locate unit : " << itpck.Key()->ToCString() << endm; SetFailed(); } else { @@ -73,7 +73,7 @@ void WOKDeliv_DeliveryStepList::Execute(const Handle(WOKMake_HSequenceOfInputFil thestep->Make(); Handle(WOKMake_HSequenceOfOutputFile) thefiles = thestep->OutputFileList(); if (thefiles.IsNull()) { - ErrorMsg << "WOKDeliv_DeliveryStepList::Execute" + ErrorMsg() << "WOKDeliv_DeliveryStepList::Execute" << "Step " << namestep << " not done for unit " << thesourceunit->Name() << endm; okexec = Standard_False; } @@ -107,7 +107,7 @@ void WOKDeliv_DeliveryStepList::Execute(const Handle(WOKMake_HSequenceOfInputFil } } else { - ErrorMsg << "WOKDeliv_DeliveryStepList::Execute" << "Cannot find delivery : " << myList->GetName()->ToCString() << endm; + ErrorMsg() << "WOKDeliv_DeliveryStepList::Execute" << "Cannot find delivery : " << myList->GetName()->ToCString() << endm; } } if (okexec) { diff --git a/src/WOKDeliv/WOKDeliv_ParseDelivery.cxx b/src/WOKDeliv/WOKDeliv_ParseDelivery.cxx index f7e1b7c..f9e2acf 100755 --- a/src/WOKDeliv/WOKDeliv_ParseDelivery.cxx +++ b/src/WOKDeliv/WOKDeliv_ParseDelivery.cxx @@ -110,7 +110,7 @@ extern "C" { Handle(TCollection_HAsciiString) thes = new TCollection_HAsciiString(s); getunit->AssignCat(thes); if (!thelist->ChangeMap().Add(getunit)) { - WarningMsg << "WOKDeliv_ParseDelivery" << " Get " + WarningMsg() << "WOKDeliv_ParseDelivery" << " Get " << getunit->ToCString() << " already sent" << endm; } } @@ -131,7 +131,7 @@ extern "C" { if (goandtreat) { Handle(TCollection_HAsciiString) thes = new TCollection_HAsciiString(s); if (!thelist->ChangeRequireMap().Add(thes)) { - WarningMsg << "WOKDeliv_ParseDelivery" << " Requires " + WarningMsg() << "WOKDeliv_ParseDelivery" << " Requires " << s << " already sent" << endm; } } @@ -165,7 +165,7 @@ extern "C" { } if (doit) { if (!thelist->ChangeMap().Add(curunit)) { - WarningMsg << "WOKDeliv_ParseDelivery" << " Unit " + WarningMsg() << "WOKDeliv_ParseDelivery" << " Unit " << curunit->ToCString() << " already sent" << endm; } } @@ -202,10 +202,10 @@ extern "C" { int DELIVERYerror(char* msg) { if (msg == NULL) { - ErrorMsg << "ParseCOMPONENTS" << "COMPONENTS, line " << DELIVERYlineno << " : syntax error..." << endm; + ErrorMsg() << "ParseCOMPONENTS" << "COMPONENTS, line " << DELIVERYlineno << " : syntax error..." << endm; } else { - ErrorMsg << "ParseCOMPONENTS" << "COMPONENTS, line " << DELIVERYlineno << " : " << msg << endm; + ErrorMsg() << "ParseCOMPONENTS" << "COMPONENTS, line " << DELIVERYlineno << " : " << msg << endm; } ErrorEncoutered = 1; return 1; @@ -244,19 +244,19 @@ Handle(WOKDeliv_DeliveryList) WOKDeliv_Delivery_Parse(int aStep) void WOKDeliv_DeliveryList_Dump(const Handle(WOKDeliv_DeliveryList)& alist) { - InfoMsg << "Dump of DeliveryList" << endm; - InfoMsg << "Name" << endm; - InfoMsg << alist->GetName()->ToCString() << endm; - InfoMsg << "Requires" << endm; + InfoMsg() << "Dump of DeliveryList" << endm; + InfoMsg() << "Name" << endm; + InfoMsg() << alist->GetName()->ToCString() << endm; + InfoMsg() << "Requires" << endm; WOKTools_MapIteratorOfMapOfHAsciiString it1(alist->GetRequireMap()); while (it1.More()) { - InfoMsg << it1.Key()->ToCString() << endm; + InfoMsg() << it1.Key()->ToCString() << endm; it1.Next(); } - InfoMsg << "Content" << endm; + InfoMsg() << "Content" << endm; WOKTools_MapIteratorOfMapOfHAsciiString it2(alist->GetMap()); while (it2.More()) { - InfoMsg << it2.Key()->ToCString() << endm; + InfoMsg() << it2.Key()->ToCString() << endm; it2.Next(); } } -- 2.39.5