From 3ae02ea13be9680d8a85ffe2b188b5ffce77fac1 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/WOKBuilder/WOKBuilder_ArchiveExtract.cxx | 10 +- src/WOKBuilder/WOKBuilder_Archiver.cxx | 20 ++-- src/WOKBuilder/WOKBuilder_CodeGenerator.cxx | 22 ++-- .../WOKBuilder_CodeGeneratorIterator.cxx | 6 +- src/WOKBuilder/WOKBuilder_Command.cxx | 12 +- src/WOKBuilder/WOKBuilder_Compiler.cxx | 28 ++--- .../WOKBuilder_CompilerIterator.cxx | 6 +- src/WOKBuilder/WOKBuilder_DLLinker.cxx | 2 +- src/WOKBuilder/WOKBuilder_EXELinker.cxx | 2 +- .../WOKBuilder_ExecutableLinker.cxx | 2 +- src/WOKBuilder/WOKBuilder_Linker.cxx | 32 ++--- src/WOKBuilder/WOKBuilder_MSAction.cxx | 2 +- .../WOKBuilder_MSClientExtractor.cxx | 10 +- src/WOKBuilder/WOKBuilder_MSExtractor.cxx | 14 +-- .../WOKBuilder_MSExtractorIterator.cxx | 4 +- .../WOKBuilder_MSHeaderExtractor.cxx | 14 +-- src/WOKBuilder/WOKBuilder_MSJiniExtractor.cxx | 10 +- src/WOKBuilder/WOKBuilder_MSTranslator.cxx | 110 +++++++++--------- .../WOKBuilder_MSTranslatorIterator.cxx | 6 +- src/WOKBuilder/WOKBuilder_MSchema.cxx | 16 +-- src/WOKBuilder/WOKBuilder_ToolInProcess.cxx | 8 +- src/WOKBuilder/WOKBuilder_ToolInShell.cxx | 4 +- .../WOKBuilder_ToolInShellIterator.cxx | 14 +-- src/WOKBuilder/WOKBuilder_WNTCollector.cxx | 36 +++--- 24 files changed, 195 insertions(+), 195 deletions(-) diff --git a/src/WOKBuilder/WOKBuilder_ArchiveExtract.cxx b/src/WOKBuilder/WOKBuilder_ArchiveExtract.cxx index f71e1b9..18aca60 100755 --- a/src/WOKBuilder/WOKBuilder_ArchiveExtract.cxx +++ b/src/WOKBuilder/WOKBuilder_ArchiveExtract.cxx @@ -92,7 +92,7 @@ WOKBuilder_BuildStatus WOKBuilder_ArchiveExtract::Execute() astr = Params().Eval(Template()->ToCString()); WOK_TRACE { - VerboseMsg("WOK_ARX") << "WOKBuilder_ArchiveExtract::Execute" + VerboseMsg()("WOK_ARX") << "WOKBuilder_ArchiveExtract::Execute" << "Archive line : " << astr << endm; } @@ -100,12 +100,12 @@ WOKBuilder_BuildStatus WOKBuilder_ArchiveExtract::Execute() if(Shell()->Status()) { - ErrorMsg << "WOKBuilder_ArchiveExtract::Execute" << "Errors occured in Shell" << endm; + ErrorMsg() << "WOKBuilder_ArchiveExtract::Execute" << "Errors occured in Shell" << endm; Handle(TColStd_HSequenceOfHAsciiString) aseq = Shell()->Errors(); for(Standard_Integer i=1; i<= aseq->Length(); i++) { - ErrorMsg << "WOKBuilder_ArchiveExtract::Execute" << aseq->Value(i) << endm; + ErrorMsg() << "WOKBuilder_ArchiveExtract::Execute" << aseq->Value(i) << endm; } return WOKBuilder_Failed; @@ -129,7 +129,7 @@ WOKBuilder_BuildStatus WOKBuilder_ArchiveExtract::Execute() } else { - ErrorMsg << "WOKBuilder_ArchiveExtract::Execute" + ErrorMsg() << "WOKBuilder_ArchiveExtract::Execute" << "Object " << aseq->Value(i) << " listed in archive was not extracted" << endm; failed = Standard_True; } @@ -140,7 +140,7 @@ WOKBuilder_BuildStatus WOKBuilder_ArchiveExtract::Execute() if(failed) { - ErrorMsg << "WOKBuilder_ArchiveExtract::Execute" + ErrorMsg() << "WOKBuilder_ArchiveExtract::Execute" << "Object(s) not found" << endm; return WOKBuilder_Failed; } diff --git a/src/WOKBuilder/WOKBuilder_Archiver.cxx b/src/WOKBuilder/WOKBuilder_Archiver.cxx index 251215e..e142221 100755 --- a/src/WOKBuilder/WOKBuilder_Archiver.cxx +++ b/src/WOKBuilder/WOKBuilder_Archiver.cxx @@ -103,7 +103,7 @@ WOKBuilder_BuildStatus WOKBuilder_Archiver::Execute() if(objtempl.IsNull()) { - ErrorMsg << "WOKBuilder_Archiver::Execute" + ErrorMsg() << "WOKBuilder_Archiver::Execute" << "Could not eval Tool Parameter " << Name() << "_ObjectRef" << endm; return WOKBuilder_Failed; } @@ -137,7 +137,7 @@ WOKBuilder_BuildStatus WOKBuilder_Archiver::Execute() if(!objstream.good()) { - ErrorMsg << "WOKBuilder_Archiver::Execute" + ErrorMsg() << "WOKBuilder_Archiver::Execute" << "Could not open " << objlistpath->Name() << " for writing" << endm; return WOKBuilder_Failed; } @@ -166,12 +166,12 @@ WOKBuilder_BuildStatus WOKBuilder_Archiver::Execute() if(Shell()->Status()) { - ErrorMsg << "WOKBuilder_Archiver::Execute" << "Errors occured in Shell during begin" << endm; + ErrorMsg() << "WOKBuilder_Archiver::Execute" << "Errors occured in Shell during begin" << endm; Handle(TColStd_HSequenceOfHAsciiString) aseq = Shell()->Errors(); for(Standard_Integer i=1; i<= aseq->Length(); i++) { - ErrorMsg << "WOKBuilder_Archiver::Execute" << aseq->Value(i) << endm; + ErrorMsg() << "WOKBuilder_Archiver::Execute" << aseq->Value(i) << endm; } return WOKBuilder_Failed; @@ -198,7 +198,7 @@ WOKBuilder_BuildStatus WOKBuilder_Archiver::Execute() astr = Params().Eval("LDAR_Iter"); WOK_TRACE { - VerboseMsg("WOK_LDAR") << "WOKBuilder_Archiver::Execute" + VerboseMsg()("WOK_LDAR") << "WOKBuilder_Archiver::Execute" << "Archive line : " << astr << endm; } @@ -206,12 +206,12 @@ WOKBuilder_BuildStatus WOKBuilder_Archiver::Execute() if(Shell()->Status()) { - ErrorMsg << "WOKBuilder_Archiver::Execute" << "Errors occured in Shell during iteration" << endm; + ErrorMsg() << "WOKBuilder_Archiver::Execute" << "Errors occured in Shell during iteration" << endm; Handle(TColStd_HSequenceOfHAsciiString) aseq = Shell()->Errors(); for(Standard_Integer i=1; i<= aseq->Length(); i++) { - ErrorMsg << "WOKBuilder_Archiver::Execute" << aseq->Value(i) << endm; + ErrorMsg() << "WOKBuilder_Archiver::Execute" << aseq->Value(i) << endm; } return WOKBuilder_Failed; @@ -222,7 +222,7 @@ WOKBuilder_BuildStatus WOKBuilder_Archiver::Execute() astr = Params().Eval("LDAR_End"); WOK_TRACE { - VerboseMsg("WOK_LDAR") << "WOKBuilder_Archiver::Execute" + VerboseMsg()("WOK_LDAR") << "WOKBuilder_Archiver::Execute" << "Archive line : " << astr << endm; } @@ -230,12 +230,12 @@ WOKBuilder_BuildStatus WOKBuilder_Archiver::Execute() if(Shell()->Status()) { - ErrorMsg << "WOKBuilder_Archiver::Execute" << "Errors occured in Shell during end" << endm; + ErrorMsg() << "WOKBuilder_Archiver::Execute" << "Errors occured in Shell during end" << endm; Handle(TColStd_HSequenceOfHAsciiString) aseq = Shell()->Errors(); for(Standard_Integer i=1; i<= aseq->Length(); i++) { - ErrorMsg << "WOKBuilder_Archiver::Execute" << aseq->Value(i) << endm; + ErrorMsg() << "WOKBuilder_Archiver::Execute" << aseq->Value(i) << endm; } return WOKBuilder_Failed; diff --git a/src/WOKBuilder/WOKBuilder_CodeGenerator.cxx b/src/WOKBuilder/WOKBuilder_CodeGenerator.cxx index c5db209..3be9129 100755 --- a/src/WOKBuilder/WOKBuilder_CodeGenerator.cxx +++ b/src/WOKBuilder/WOKBuilder_CodeGenerator.cxx @@ -67,8 +67,8 @@ WOKBuilder_BuildStatus WOKBuilder_CodeGenerator::Execute() astr = Params().Eval(Template()->ToCString(), Standard_True); WOK_TRACE { - VerboseMsg("WOK_CODEGEN") << "WOKBuilder_Compiler::Execute" << "Compilation line : " << endm; - VerboseMsg("WOK_CODEGEN") << "WOKBuilder_Compiler::Execute" << astr << endm; + VerboseMsg()("WOK_CODEGEN") << "WOKBuilder_Compiler::Execute" << "Compilation line : " << endm; + VerboseMsg()("WOK_CODEGEN") << "WOKBuilder_Compiler::Execute" << astr << endm; } Shell()->Execute(astr); @@ -78,26 +78,26 @@ WOKBuilder_BuildStatus WOKBuilder_CodeGenerator::Execute() if(Shell()->Status()) { - Standard_Boolean ph = ErrorMsg.PrintHeader(); + Standard_Boolean ph = ErrorMsg().PrintHeader(); - ErrorMsg << "WOKBuilder_Compiler::Execute" << "Errors occured in Shell" << endm; - ErrorMsg.DontPrintHeader(); + ErrorMsg() << "WOKBuilder_Compiler::Execute" << "Errors occured in Shell" << endm; + ErrorMsg().DontPrintHeader(); for(Standard_Integer i=1; i<= resseq->Length(); i++) { - ErrorMsg << "WOKBuilder_Compiler::Execute" << resseq->Value(i) << endm; + ErrorMsg() << "WOKBuilder_Compiler::Execute" << resseq->Value(i) << endm; } - if(ph) ErrorMsg.DoPrintHeader(); + if(ph) ErrorMsg().DoPrintHeader(); return WOKBuilder_Failed; } else { - Standard_Boolean ph = InfoMsg.PrintHeader(); - InfoMsg.DontPrintHeader(); + Standard_Boolean ph = InfoMsg().PrintHeader(); + InfoMsg().DontPrintHeader(); for(Standard_Integer i=1; i<= resseq->Length(); i++) { - InfoMsg << "WOKBuilder_Compiler::Execute" << resseq->Value(i) << endm; + InfoMsg() << "WOKBuilder_Compiler::Execute" << resseq->Value(i) << endm; } - if(ph) InfoMsg.DoPrintHeader(); + if(ph) InfoMsg().DoPrintHeader(); } Shell()->ClearOutput(); diff --git a/src/WOKBuilder/WOKBuilder_CodeGeneratorIterator.cxx b/src/WOKBuilder/WOKBuilder_CodeGeneratorIterator.cxx index 410b0c6..46a5b64 100755 --- a/src/WOKBuilder/WOKBuilder_CodeGeneratorIterator.cxx +++ b/src/WOKBuilder/WOKBuilder_CodeGeneratorIterator.cxx @@ -69,12 +69,12 @@ void WOKBuilder_CodeGeneratorIterator::Init(const Handle(WOKUtils_Shell)& ashell if(optline.IsNull()) { - ErrorMsg << "WOKBuilder_CodeGeneratorIterator::Init" + ErrorMsg() << "WOKBuilder_CodeGeneratorIterator::Init" << "Could not eval code generator " << acodegen->Name() << " options" << endm; return; } - InfoMsg << "WOKBuilder_CodeGeneratorIterator::Init" << optline << endm; + InfoMsg() << "WOKBuilder_CodeGeneratorIterator::Init" << optline << endm; } } } @@ -106,7 +106,7 @@ WOKBuilder_BuildStatus WOKBuilder_CodeGeneratorIterator::Execute(const Handle(WO if(aCodeGenerator.IsNull()) { - ErrorMsg << "WOKBuilder_CodeGeneratorIterator::Execute" + ErrorMsg() << "WOKBuilder_CodeGeneratorIterator::Execute" << "Could not find appropriate CodeGenerator for " << aCodeGenFile->Path()->Name() << endm; return WOKBuilder_Failed; } diff --git a/src/WOKBuilder/WOKBuilder_Command.cxx b/src/WOKBuilder/WOKBuilder_Command.cxx index 31092eb..143d5c4 100755 --- a/src/WOKBuilder/WOKBuilder_Command.cxx +++ b/src/WOKBuilder/WOKBuilder_Command.cxx @@ -122,12 +122,12 @@ WOKBuilder_BuildStatus WOKBuilder_Command::ReplaceIfChanged(const Handle(WOKUtil Shell()->ClearOutput(); return WOKBuilder_Success; case 2: - ErrorMsg << "WOKBuilder_Command::Execute" << "Errors occured in Shell" << endm; + ErrorMsg() << "WOKBuilder_Command::Execute" << "Errors occured in Shell" << endm; Handle(TColStd_HSequenceOfHAsciiString) aseq = Shell()->Errors(); for(Standard_Integer i=1; i<= aseq->Length(); i++) { - ErrorMsg << "WOKBuilder_Command::Execute" << aseq->Value(i) << endm; + ErrorMsg() << "WOKBuilder_Command::Execute" << aseq->Value(i) << endm; } Shell()->ClearOutput(); return WOKBuilder_Failed; @@ -167,12 +167,12 @@ WOKBuilder_BuildStatus WOKBuilder_Command::ReplaceIfChangedWith(const Handle(WOK Shell()->ClearOutput(); return WOKBuilder_Success; case 2: - ErrorMsg << "WOKBuilder_Command::Execute" << "Errors occured in Shell" << endm; + ErrorMsg() << "WOKBuilder_Command::Execute" << "Errors occured in Shell" << endm; Handle(TColStd_HSequenceOfHAsciiString) aseq = Shell()->Errors(); for(Standard_Integer i=1; i<= aseq->Length(); i++) { - ErrorMsg << "WOKBuilder_Command::Execute" << aseq->Value(i) << endm; + ErrorMsg() << "WOKBuilder_Command::Execute" << aseq->Value(i) << endm; } Shell()->ClearOutput(); return WOKBuilder_Failed; @@ -274,12 +274,12 @@ WOKBuilder_BuildStatus WOKBuilder_Command::Execute() if(Shell()->Status()) { - ErrorMsg << "WOKBuilder_Command::Execute" << "Errors occured in Shell" << endm; + ErrorMsg() << "WOKBuilder_Command::Execute" << "Errors occured in Shell" << endm; Handle(TColStd_HSequenceOfHAsciiString) aseq = Shell()->Errors(); for(Standard_Integer i=1; i<= aseq->Length(); i++) { - ErrorMsg << "WOKBuilder_Command::Execute" << aseq->Value(i) << endm; + ErrorMsg() << "WOKBuilder_Command::Execute" << aseq->Value(i) << endm; } Shell()->ClearOutput(); return WOKBuilder_Failed; diff --git a/src/WOKBuilder/WOKBuilder_Compiler.cxx b/src/WOKBuilder/WOKBuilder_Compiler.cxx index a5a0a67..e4f8fb2 100755 --- a/src/WOKBuilder/WOKBuilder_Compiler.cxx +++ b/src/WOKBuilder/WOKBuilder_Compiler.cxx @@ -74,7 +74,7 @@ void WOKBuilder_Compiler::SetIncludeDirectories(const Handle(WOKUtils_HSequenceO } else { - WarningMsg << "WOKBuilder_Compiler::SetIncludeDirectories" + WarningMsg() << "WOKBuilder_Compiler::SetIncludeDirectories" << "Could not eval database directive: CMPLRS_IncDirective" << endm; } } @@ -123,7 +123,7 @@ void WOKBuilder_Compiler::SetDatabaseDirectories(const Handle(WOKUtils_HSequence } else { - WarningMsg << "WOKBuilder_Compiler::SetDatabaseDirectories" + WarningMsg() << "WOKBuilder_Compiler::SetDatabaseDirectories" << "Could not eval database directive: CMPLRS_DBDirective" << endm; } } @@ -197,9 +197,9 @@ WOKBuilder_BuildStatus WOKBuilder_Compiler::Execute() astr = EvalToolTemplate(Template()->ToCString()); WOK_TRACE { - VerboseMsg("WOK_CMPLRS") << "WOKBuilder_Compiler::Execute" + VerboseMsg()("WOK_CMPLRS") << "WOKBuilder_Compiler::Execute" << "Compilation line : " << endm; - VerboseMsg("WOK_CMPLRS") << "WOKBuilder_Compiler::Execute" + VerboseMsg()("WOK_CMPLRS") << "WOKBuilder_Compiler::Execute" << astr << endm; } //---> EUG4YAN @@ -218,26 +218,26 @@ WOKBuilder_BuildStatus WOKBuilder_Compiler::Execute() if(Shell()->Status()) { - Standard_Boolean ph = ErrorMsg.PrintHeader(); + Standard_Boolean ph = ErrorMsg().PrintHeader(); - ErrorMsg << "WOKBuilder_Compiler::Execute" << "Errors occured in Shell" << endm; - ErrorMsg.DontPrintHeader(); + ErrorMsg() << "WOKBuilder_Compiler::Execute" << "Errors occured in Shell" << endm; + ErrorMsg().DontPrintHeader(); for(Standard_Integer i=start; i<= resseq->Length(); i++) { - ErrorMsg << "WOKBuilder_Compiler::Execute" << resseq->Value(i) << endm; + ErrorMsg() << "WOKBuilder_Compiler::Execute" << resseq->Value(i) << endm; } - if(ph) ErrorMsg.DoPrintHeader(); + if(ph) ErrorMsg().DoPrintHeader(); return WOKBuilder_Failed; } else { - Standard_Boolean ph = InfoMsg.PrintHeader(); - InfoMsg.DontPrintHeader(); + Standard_Boolean ph = InfoMsg().PrintHeader(); + InfoMsg().DontPrintHeader(); for(Standard_Integer i=start; i<= resseq->Length(); i++) { - InfoMsg << "WOKBuilder_Compiler::Execute" << resseq->Value(i) << endm; + InfoMsg() << "WOKBuilder_Compiler::Execute" << resseq->Value(i) << endm; } - if(ph) InfoMsg.DoPrintHeader(); + if(ph) InfoMsg().DoPrintHeader(); } Shell()->ClearOutput(); @@ -305,7 +305,7 @@ WOKBuilder_BuildStatus WOKBuilder_Compiler::Execute() dPath.SystemName ( name ); - ErrorMsg << "WOKBuilder_Compiler::Execute" + ErrorMsg() << "WOKBuilder_Compiler::Execute" << "could not create '" << new TCollection_HAsciiString ( name ) << "'" << endm; diff --git a/src/WOKBuilder/WOKBuilder_CompilerIterator.cxx b/src/WOKBuilder/WOKBuilder_CompilerIterator.cxx index d68bc10..9577e0e 100755 --- a/src/WOKBuilder/WOKBuilder_CompilerIterator.cxx +++ b/src/WOKBuilder/WOKBuilder_CompilerIterator.cxx @@ -87,14 +87,14 @@ void WOKBuilder_CompilerIterator::Init(const Handle(WOKUtils_Shell)& ashell, if(optline.IsNull()) { - ErrorMsg << "WOKBuilder_CompilerIterator::Init" + ErrorMsg() << "WOKBuilder_CompilerIterator::Init" << "Could not eval compiler " << acompiler->Name() << " options" << endm; return; } //---> EUG4YAN if ( !g_fCompOrLnk ) //<--- EUG4YAN - InfoMsg << "WOKBuilder_CompilerIterator::Init" << optline << endm; + InfoMsg() << "WOKBuilder_CompilerIterator::Init" << optline << endm; } } } @@ -134,7 +134,7 @@ WOKBuilder_BuildStatus WOKBuilder_CompilerIterator::Execute(const Handle(WOKBuil //<--- EUG4YAN if(acompiler.IsNull()) { - ErrorMsg << "WOKBuilder_CompilerIterator::Execute" + ErrorMsg() << "WOKBuilder_CompilerIterator::Execute" << "Could not find appropriate Compiler for " << acompilable->Path()->Name() << endm; return WOKBuilder_Failed; } diff --git a/src/WOKBuilder/WOKBuilder_DLLinker.cxx b/src/WOKBuilder/WOKBuilder_DLLinker.cxx index 0fc0ff2..ebe3e2e 100755 --- a/src/WOKBuilder/WOKBuilder_DLLinker.cxx +++ b/src/WOKBuilder/WOKBuilder_DLLinker.cxx @@ -28,7 +28,7 @@ Handle(TCollection_HAsciiString) WOKBuilder_DLLinker::EvalHeader() { retVal = new TCollection_HAsciiString ( val ); - InfoMsg << "WOKBuilder_DLLinker :: EvalHeader" + InfoMsg() << "WOKBuilder_DLLinker :: EvalHeader" << '\'' << retVal << "' is using" << endm; } else diff --git a/src/WOKBuilder/WOKBuilder_EXELinker.cxx b/src/WOKBuilder/WOKBuilder_EXELinker.cxx index 3e63087..465bdd2 100755 --- a/src/WOKBuilder/WOKBuilder_EXELinker.cxx +++ b/src/WOKBuilder/WOKBuilder_EXELinker.cxx @@ -30,7 +30,7 @@ Handle(TCollection_HAsciiString) WOKBuilder_EXELinker::EvalHeader() { retVal = new TCollection_HAsciiString(val); - InfoMsg << "WOKBuilder_EXELinker::EvalHeader" + InfoMsg() << "WOKBuilder_EXELinker::EvalHeader" << '\'' << retVal << "' is using" << endm; } else diff --git a/src/WOKBuilder/WOKBuilder_ExecutableLinker.cxx b/src/WOKBuilder/WOKBuilder_ExecutableLinker.cxx index 33ea3a3..b00c80c 100755 --- a/src/WOKBuilder/WOKBuilder_ExecutableLinker.cxx +++ b/src/WOKBuilder/WOKBuilder_ExecutableLinker.cxx @@ -45,7 +45,7 @@ Handle(TCollection_HAsciiString) WOKBuilder_ExecutableLinker::EvalHeader() if(templ.IsNull()) { - ErrorMsg << "WOKBuilder_ExecutableLinker::EvalHeader" << "Could not eval parameter : " << templname << endm; + ErrorMsg() << "WOKBuilder_ExecutableLinker::EvalHeader" << "Could not eval parameter : " << templname << endm; return line; } diff --git a/src/WOKBuilder/WOKBuilder_Linker.cxx b/src/WOKBuilder/WOKBuilder_Linker.cxx index 738331b..678b35e 100755 --- a/src/WOKBuilder/WOKBuilder_Linker.cxx +++ b/src/WOKBuilder/WOKBuilder_Linker.cxx @@ -125,7 +125,7 @@ Handle(TCollection_HAsciiString) WOKBuilder_Linker::LibraryRefLine(const Handle( templname = "ArchiveFullPath"; break; default: - ErrorMsg << "WOKBuilder_Linker::LibraryRefLine" << "Unknown Library Ref Type" << endm; + ErrorMsg() << "WOKBuilder_Linker::LibraryRefLine" << "Unknown Library Ref Type" << endm; return line; } @@ -133,7 +133,7 @@ Handle(TCollection_HAsciiString) WOKBuilder_Linker::LibraryRefLine(const Handle( if(templ.IsNull()) { - ErrorMsg << "WOKBuilder_Linker::LibraryRefLine" << "Could not eval parameter : " << templname << endm; + ErrorMsg() << "WOKBuilder_Linker::LibraryRefLine" << "Could not eval parameter : " << templname << endm; return line; } @@ -270,7 +270,7 @@ Handle(TCollection_HAsciiString) WOKBuilder_Linker::EvalLibSearchDirectives() } else { - WarningMsg << "WOKBuilder_Linker::EvalLibSearchDirectives" + WarningMsg() << "WOKBuilder_Linker::EvalLibSearchDirectives" << "Could not eval lib directive: LD_LibSearchPath" << endm; } } @@ -304,7 +304,7 @@ Handle(TCollection_HAsciiString) WOKBuilder_Linker::EvalDatabaseDirectives() } else { - WarningMsg << "WOKBuilder_Linker::EvalDatabaseDirectives" + WarningMsg() << "WOKBuilder_Linker::EvalDatabaseDirectives" << "Could not eval database directive: LD_DBDirective" << endm; } } @@ -382,7 +382,7 @@ Handle(TCollection_HAsciiString) WOKBuilder_Linker::EvalFooter() if(astr.IsNull()) { - WarningMsg << "WOKBuilder_Linker::EvalFooter" + WarningMsg() << "WOKBuilder_Linker::EvalFooter" << "Could not eval ExternLib : " << myexterns->Value(i) << endm; } else @@ -396,7 +396,7 @@ Handle(TCollection_HAsciiString) WOKBuilder_Linker::EvalFooter() if(templ.IsNull()) { - ErrorMsg << "WOKBuilder_Linker::EvalFooter" << "Could not eval parameter : " << Name() << "_Footer" << endm; + ErrorMsg() << "WOKBuilder_Linker::EvalFooter" << "Could not eval parameter : " << Name() << "_Footer" << endm; return line; } @@ -440,7 +440,7 @@ WOKBuilder_BuildStatus WOKBuilder_Linker::Execute() if(!objstream.good()) { - ErrorMsg << "WOKBuilder_Linker::Execute" + ErrorMsg() << "WOKBuilder_Linker::Execute" << "Could not open " << objlistpath->Name() << " for writing" << endm; return WOKBuilder_Failed; } @@ -585,12 +585,12 @@ WOKBuilder_BuildStatus WOKBuilder_Linker::Execute() if(Shell()->Status()) { - Standard_Boolean ph = ErrorMsg.PrintHeader(); + Standard_Boolean ph = ErrorMsg().PrintHeader(); - ErrorMsg << "WOKBuilder_Linker::Execute" << "Errors Occured :" << endm; + ErrorMsg() << "WOKBuilder_Linker::Execute" << "Errors Occured :" << endm; errmsgs = Shell()->Errors(); - ErrorMsg.DontPrintHeader(); + ErrorMsg().DontPrintHeader(); for(Standard_Integer i=1; i<= errmsgs->Length(); i++) { #ifndef WNT @@ -601,15 +601,15 @@ WOKBuilder_BuildStatus WOKBuilder_Linker::Execute() errmsgs -> Value ( i ) -> Length () - skipStr1 -> Length () + 1 ) continue; #endif // SOLARIS - ErrorMsg << "WOKBuilder_Linker::Execute" << errmsgs->Value(i) << endm; + ErrorMsg() << "WOKBuilder_Linker::Execute" << errmsgs->Value(i) << endm; } - if(ph) ErrorMsg.DoPrintHeader(); + if(ph) ErrorMsg().DoPrintHeader(); return WOKBuilder_Failed; } else { - Standard_Boolean ph = InfoMsg.PrintHeader(); - InfoMsg.DontPrintHeader(); + Standard_Boolean ph = InfoMsg().PrintHeader(); + InfoMsg().DontPrintHeader(); errmsgs = Shell()->Errors(); #if defined (__sun) || defined(SOLARIS) if ( !( errmsgs -> Length () == 4 && @@ -628,9 +628,9 @@ WOKBuilder_BuildStatus WOKBuilder_Linker::Execute() errmsgs -> Value ( i ) -> Length () - skipStr1 -> Length () + 1 ) continue; #endif // SOLARIS - InfoMsg << "WOKBuilder_Linker::Execute" << errmsgs->Value(i) << endm; + InfoMsg() << "WOKBuilder_Linker::Execute" << errmsgs->Value(i) << endm; } - if(ph) InfoMsg.DoPrintHeader(); + if(ph) InfoMsg().DoPrintHeader(); } Shell()->ClearOutput(); diff --git a/src/WOKBuilder/WOKBuilder_MSAction.cxx b/src/WOKBuilder/WOKBuilder_MSAction.cxx index 76ba283..68c0feb 100755 --- a/src/WOKBuilder/WOKBuilder_MSAction.cxx +++ b/src/WOKBuilder/WOKBuilder_MSAction.cxx @@ -97,7 +97,7 @@ void WOKBuilder_MSAction::GetDate() mydate = time(NULL); if(mydate == -1) { - ErrorMsg << "WOKBuilder_MSAction::GetDate" << "Could not obtain current date" << endm; + ErrorMsg() << "WOKBuilder_MSAction::GetDate" << "Could not obtain current date" << endm; Standard_ProgramError::Raise("WOKBuilder_MSAction::GetDate"); } } diff --git a/src/WOKBuilder/WOKBuilder_MSClientExtractor.cxx b/src/WOKBuilder/WOKBuilder_MSClientExtractor.cxx index a285b5a..ec46273 100755 --- a/src/WOKBuilder/WOKBuilder_MSClientExtractor.cxx +++ b/src/WOKBuilder/WOKBuilder_MSClientExtractor.cxx @@ -163,11 +163,11 @@ WOKBuilder_MSActionStatus WOKBuilder_MSClientExtractor::ExtractionStatus(const H WOKUtils_TimeStat depdate = GetTypeMDate(astr); WOK_TRACE { - VerboseMsg("WOK_EXTRACT") << "WOKBuilder_MSClientExtractor::ExtractionStatus" + VerboseMsg()("WOK_EXTRACT") << "WOKBuilder_MSClientExtractor::ExtractionStatus" << "Comparing extraction date : " << (Standard_Integer) anaction->Date() << " of " << anaction->Entity()->Name() << endm; - VerboseMsg("WOK_EXTRACT") << "WOKBuilder_MSClientExtractor::ExtractionStatus" + VerboseMsg()("WOK_EXTRACT") << "WOKBuilder_MSClientExtractor::ExtractionStatus" << "with modification date : " << (Standard_Integer) depdate << " of " << astr << endm; } @@ -175,7 +175,7 @@ WOKBuilder_MSActionStatus WOKBuilder_MSClientExtractor::ExtractionStatus(const H if( GetTypeMDate(astr) > anaction->Date()) { WOK_TRACE { - VerboseMsg("WOK_EXTRACT") << "WOKBuilder_MSClientExtractor::ExtractionStatus" + VerboseMsg()("WOK_EXTRACT") << "WOKBuilder_MSClientExtractor::ExtractionStatus" << anaction->Entity()->Name() << " is out of date compared to " << astr << endm; } return WOKBuilder_OutOfDate; @@ -183,14 +183,14 @@ WOKBuilder_MSActionStatus WOKBuilder_MSClientExtractor::ExtractionStatus(const H else { WOK_TRACE { - VerboseMsg("WOK_EXTRACT") << "WOKBuilder_MSClientExtractor::ExtractionStatus" + VerboseMsg()("WOK_EXTRACT") << "WOKBuilder_MSClientExtractor::ExtractionStatus" << anaction->Entity()->Name() << " is up to date compared to : " << astr << endm; } } } WOK_TRACE { - VerboseMsg("WOK_EXTRACT") << "WOKBuilder_MSClientExtractor::ExtractionStatus" + VerboseMsg()("WOK_EXTRACT") << "WOKBuilder_MSClientExtractor::ExtractionStatus" << anaction->Entity()->Name() << " is up to date" << endm; } diff --git a/src/WOKBuilder/WOKBuilder_MSExtractor.cxx b/src/WOKBuilder/WOKBuilder_MSExtractor.cxx index 713561d..f7e26d3 100755 --- a/src/WOKBuilder/WOKBuilder_MSExtractor.cxx +++ b/src/WOKBuilder/WOKBuilder_MSExtractor.cxx @@ -75,7 +75,7 @@ void WOKBuilder_MSExtractor::Load() if(myshared.IsNull() == Standard_True) { - ErrorMsg << "WOKBuilder_MSExtractor::Load" + ErrorMsg() << "WOKBuilder_MSExtractor::Load" << "Parameter " << astr << " could not be evaluated" << endm; return; } @@ -89,7 +89,7 @@ void WOKBuilder_MSExtractor::Load() libpath = Params().SearchFile(myshared); if(libpath.IsNull()) { - ErrorMsg << "WOKBuilder_MSExtractor::Load" + ErrorMsg() << "WOKBuilder_MSExtractor::Load" << "WOKBuilder_MSExtractor::Load Could not find file : " << myshared << endm; } } @@ -100,7 +100,7 @@ void WOKBuilder_MSExtractor::Load() if(myprefix.IsNull()) { - ErrorMsg << "WOKBuilder_MSExtractor::Load" << "Parameter " << astr << " could not be evaluated" << endm; + ErrorMsg() << "WOKBuilder_MSExtractor::Load" << "Parameter " << astr << " could not be evaluated" << endm; return; } } @@ -109,7 +109,7 @@ void WOKBuilder_MSExtractor::Load() if(ashared.DlOpen(OSD_RTLD_NOW) == Standard_False) { - ErrorMsg << "WOKBuilder_MSExtractor::Load" << ashared.DlError() << endm; + ErrorMsg() << "WOKBuilder_MSExtractor::Load" << ashared.DlError() << endm; return; } @@ -120,7 +120,7 @@ void WOKBuilder_MSExtractor::Load() if( mytemplfunc == NULL) { - ErrorMsg << "WOKBuilder_MSExtractor::Load" << ashared.DlError() << endm; + ErrorMsg() << "WOKBuilder_MSExtractor::Load" << ashared.DlError() << endm; return; } @@ -131,7 +131,7 @@ void WOKBuilder_MSExtractor::Load() if(myextractfunc == NULL) { - ErrorMsg << "WOKBuilder_MSExtractor::Load" << ashared.DlError() << endm; + ErrorMsg() << "WOKBuilder_MSExtractor::Load" << ashared.DlError() << endm; return; } @@ -218,7 +218,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSExtractor::Extract(const Handle(WOKBuilder_M if(adbms.IsNull()) { - WarningMsg << "WOKBuilder_MSExtractor::Extract" + WarningMsg() << "WOKBuilder_MSExtractor::Extract" << "No DBMS profile specified : using DFLT" << endm; adbms = new TCollection_HAsciiString("DFLT"); } diff --git a/src/WOKBuilder/WOKBuilder_MSExtractorIterator.cxx b/src/WOKBuilder/WOKBuilder_MSExtractorIterator.cxx index 73a092a..d97192c 100755 --- a/src/WOKBuilder/WOKBuilder_MSExtractorIterator.cxx +++ b/src/WOKBuilder/WOKBuilder_MSExtractorIterator.cxx @@ -31,7 +31,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSExtractorIterator::Execute(const Handle(WOKB myextractor->SetEntity(anentity); - InfoMsg << "WOKBuilder_MSExtractorIterator::Execute" << "Extracting " << anentity->Name() << endm; + InfoMsg() << "WOKBuilder_MSExtractorIterator::Execute" << "Extracting " << anentity->Name() << endm; status = myextractor->Extract(mymeta, anentity); myproduction = myextractor->Produces(); @@ -52,7 +52,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSExtractorIterator::Execute(const Handle(WOKB myextractor->SetEntity(anentity); - InfoMsg << "WOKBuilder_MSExtractorIterator::Execute" << "Extracting " << anentity->Name() << endm; + InfoMsg() << "WOKBuilder_MSExtractorIterator::Execute" << "Extracting " << anentity->Name() << endm; status = myextractor->Extract(mymeta, anentity, amode); myproduction = myextractor->Produces(); diff --git a/src/WOKBuilder/WOKBuilder_MSHeaderExtractor.cxx b/src/WOKBuilder/WOKBuilder_MSHeaderExtractor.cxx index d86aa99..aa8871e 100755 --- a/src/WOKBuilder/WOKBuilder_MSHeaderExtractor.cxx +++ b/src/WOKBuilder/WOKBuilder_MSHeaderExtractor.cxx @@ -80,7 +80,7 @@ Handle( TColStd_HSequenceOfHAsciiString ) WOK_TRACE { - VerboseMsg ( "WOK_EXTRACT" ) << "WOKBuilder_MSHeaderExtractor::ExtractionStatus" + VerboseMsg() ( "WOK_EXTRACT" ) << "WOKBuilder_MSHeaderExtractor::ExtractionStatus" << "Package not yet Implemented : out of date" << endm; } // end WOK_TRACE @@ -97,7 +97,7 @@ Handle( TColStd_HSequenceOfHAsciiString ) if ( apk.IsNull () ) { - ErrorMsg << "WOKBuilder_MSHeaderExtractor::ExtractionStatus" + ErrorMsg() << "WOKBuilder_MSHeaderExtractor::ExtractionStatus" << aName << " is not a known package and not a known type" << endm; @@ -272,17 +272,17 @@ WOKBuilder_MSActionStatus WOKBuilder_MSHeaderExtractor::ExtractionStatus(const H WOKUtils_TimeStat depdate = GetTypeMDate(astr); WOK_TRACE { - VerboseMsg("WOK_EXTRACT") << "WOKBuilder_MSHeaderExtractor::ExtractionStatus" + VerboseMsg()("WOK_EXTRACT") << "WOKBuilder_MSHeaderExtractor::ExtractionStatus" << "Comparing extraction date : " << (Standard_Integer) anaction->Date() << " of " << anaction->Entity()->Name() << endm; - VerboseMsg("WOK_EXTRACT") << "WOKBuilder_MSHeaderExtractor::ExtractionStatus" + VerboseMsg()("WOK_EXTRACT") << "WOKBuilder_MSHeaderExtractor::ExtractionStatus" << "with modification date : " << (Standard_Integer) depdate << " of " << astr << endm; } if( GetTypeMDate(astr) > anaction->Date()) { WOK_TRACE { - VerboseMsg("WOK_EXTRACT") << "WOKBuilder_MSHeaderExtractor::ExtractionStatus" + VerboseMsg()("WOK_EXTRACT") << "WOKBuilder_MSHeaderExtractor::ExtractionStatus" << anaction->Entity()->Name() << " is out of date compared to " << astr << endm; } return WOKBuilder_OutOfDate; @@ -290,14 +290,14 @@ WOKBuilder_MSActionStatus WOKBuilder_MSHeaderExtractor::ExtractionStatus(const H else { WOK_TRACE { - VerboseMsg("WOK_EXTRACT") << "WOKBuilder_MSHeaderExtractor::ExtractionStatus" + VerboseMsg()("WOK_EXTRACT") << "WOKBuilder_MSHeaderExtractor::ExtractionStatus" << anaction->Entity()->Name() << " is up to date compared to : " << astr << endm; } } } WOK_TRACE { - VerboseMsg("WOK_EXTRACT") << "WOKBuilder_MSHeaderExtractor::ExtractionStatus" + VerboseMsg()("WOK_EXTRACT") << "WOKBuilder_MSHeaderExtractor::ExtractionStatus" << anaction->Entity()->Name() << " is up to date" << endm; } diff --git a/src/WOKBuilder/WOKBuilder_MSJiniExtractor.cxx b/src/WOKBuilder/WOKBuilder_MSJiniExtractor.cxx index af5f705..06f7cd7 100755 --- a/src/WOKBuilder/WOKBuilder_MSJiniExtractor.cxx +++ b/src/WOKBuilder/WOKBuilder_MSJiniExtractor.cxx @@ -163,11 +163,11 @@ WOKBuilder_MSActionStatus WOKBuilder_MSJiniExtractor::ExtractionStatus(const Han #ifdef WOK_VERBOSE WOKUtils_TimeStat depdate = GetTypeMDate(astr); - VerboseMsg("WOK_EXTRACT") << "WOKBuilder_MSJiniExtractor::ExtractionStatus" + VerboseMsg()("WOK_EXTRACT") << "WOKBuilder_MSJiniExtractor::ExtractionStatus" << "Comparing extraction date : " << (Standard_Integer) anaction->Date() << " of " << anaction->Entity()->Name() << endm; - VerboseMsg("WOK_EXTRACT") << "WOKBuilder_MSJiniExtractor::ExtractionStatus" + VerboseMsg()("WOK_EXTRACT") << "WOKBuilder_MSJiniExtractor::ExtractionStatus" << "with modification date : " << (Standard_Integer) depdate << " of " << astr << endm; #endif @@ -175,7 +175,7 @@ WOKBuilder_MSActionStatus WOKBuilder_MSJiniExtractor::ExtractionStatus(const Han if( GetTypeMDate(astr) > anaction->Date()) { #ifdef WOK_VERBOSE - VerboseMsg("WOK_EXTRACT") << "WOKBuilder_MSJiniExtractor::ExtractionStatus" + VerboseMsg()("WOK_EXTRACT") << "WOKBuilder_MSJiniExtractor::ExtractionStatus" << anaction->Entity()->Name() << " is out of date compared to " << astr << endm; #endif return WOKBuilder_OutOfDate; @@ -183,14 +183,14 @@ WOKBuilder_MSActionStatus WOKBuilder_MSJiniExtractor::ExtractionStatus(const Han else { #ifdef WOK_VERBOSE - VerboseMsg("WOK_EXTRACT") << "WOKBuilder_MSJiniExtractor::ExtractionStatus" + VerboseMsg()("WOK_EXTRACT") << "WOKBuilder_MSJiniExtractor::ExtractionStatus" << anaction->Entity()->Name() << " is up to date compared to : " << astr << endm; #endif } } #ifdef WOK_VERBOSE - VerboseMsg("WOK_EXTRACT") << "WOKBuilder_MSJiniExtractor::ExtractionStatus" + VerboseMsg()("WOK_EXTRACT") << "WOKBuilder_MSJiniExtractor::ExtractionStatus" << anaction->Entity()->Name() << " is up to date" << endm; #endif diff --git a/src/WOKBuilder/WOKBuilder_MSTranslator.cxx b/src/WOKBuilder/WOKBuilder_MSTranslator.cxx index 475929d..6b4faca 100755 --- a/src/WOKBuilder/WOKBuilder_MSTranslator.cxx +++ b/src/WOKBuilder/WOKBuilder_MSTranslator.cxx @@ -124,7 +124,7 @@ void WOKBuilder_MSTranslator::Load() if(libpath.IsNull()) { - ErrorMsg << "WOKBuilder_MSTranslator::Load" + ErrorMsg() << "WOKBuilder_MSTranslator::Load" << "Could not find file : " << Shared() << endm; return; } @@ -134,7 +134,7 @@ void WOKBuilder_MSTranslator::Load() if(ashared.DlOpen(OSD_RTLD_NOW) == Standard_False) { - ErrorMsg << "WOKBuilder_MSTranslator::Load" << ashared.DlError() << endm; + ErrorMsg() << "WOKBuilder_MSTranslator::Load" << ashared.DlError() << endm; return; } @@ -142,7 +142,7 @@ void WOKBuilder_MSTranslator::Load() if( mytranslator == NULL) { - ErrorMsg << "WOKBuilder_MSTranslator::Load" << ashared.DlError() << endm; + ErrorMsg() << "WOKBuilder_MSTranslator::Load" << ashared.DlError() << endm; return; } @@ -214,7 +214,7 @@ WOKBuilder_MSActionStatus WOKBuilder_MSTranslator::MSActionStatus(const Handle(W if(!oldspec->Path()->Name()->IsSameString(anewcdl->Path()->Name())) { WOK_TRACE { - VerboseMsg("WOK_TRANSIT") << "WOKBuilder_MSTranslator::MSActionStatus" + VerboseMsg()("WOK_TRANSIT") << "WOKBuilder_MSTranslator::MSActionStatus" << anaction->Entity()->Name() << " is OutofDate because files are not the same" << endm; } return WOKBuilder_OutOfDate; @@ -222,7 +222,7 @@ WOKBuilder_MSActionStatus WOKBuilder_MSTranslator::MSActionStatus(const Handle(W else { WOK_TRACE { - VerboseMsg("WOK_TRANSIT") << "WOKBuilder_MSTranslator::MSActionStatus" + VerboseMsg()("WOK_TRANSIT") << "WOKBuilder_MSTranslator::MSActionStatus" << "NewFile : " << anewcdl->Path()->Name() << " is same than old : " << oldspec->Path()->Name() << endm; } @@ -234,7 +234,7 @@ WOKBuilder_MSActionStatus WOKBuilder_MSTranslator::MSActionStatus(const Handle(W if((fd=open(tempath, O_RDONLY)) == -1) { - WarningMsg << "WOKStep_MSFill::Execute" + WarningMsg() << "WOKStep_MSFill::Execute" << "Could not create : " << tempath << endm; perror(tempath); } @@ -248,7 +248,7 @@ WOKBuilder_MSActionStatus WOKBuilder_MSTranslator::MSActionStatus(const Handle(W struct stat buf; if(stat(tempath, &buf)) { - ErrorMsg << "WOKStep_MSFill::Execute" + ErrorMsg() << "WOKStep_MSFill::Execute" << "Could not stat : " << tempath << endm; } @@ -257,7 +257,7 @@ WOKBuilder_MSActionStatus WOKBuilder_MSTranslator::MSActionStatus(const Handle(W if(curdate == -1) { - ErrorMsg << "WOKStep_MSFill::Execute" + ErrorMsg() << "WOKStep_MSFill::Execute" << "Could not obtain current date" << endm; } if(buf.st_atime - curdate > 0) @@ -270,7 +270,7 @@ WOKBuilder_MSActionStatus WOKBuilder_MSTranslator::MSActionStatus(const Handle(W if(anewcdl->Path()->MDate()- decal > oldaction->Date()) { WOK_TRACE { - VerboseMsg("WOK_TRANSIT") << "WOKBuilder_MSTranslator::MSActionStatus" + VerboseMsg()("WOK_TRANSIT") << "WOKBuilder_MSTranslator::MSActionStatus" << anaction->Entity()->Name() << "is OutOfDate because of dates : " << "stored(" << (Standard_Integer) oldaction->Date() << ") file(" << (Standard_Integer) anewcdl->Path()->MDate() << ")" << endm; } @@ -279,7 +279,7 @@ WOKBuilder_MSActionStatus WOKBuilder_MSTranslator::MSActionStatus(const Handle(W else { WOK_TRACE { - VerboseMsg("WOK_TRANSIT") << "WOKBuilder_MSTranslator::MSActionStatus" + VerboseMsg()("WOK_TRANSIT") << "WOKBuilder_MSTranslator::MSActionStatus" << anaction->Entity()->Name() << " is up to date : " << "stored(" << (Standard_Integer) oldaction->Date() << ") file(" << (Standard_Integer) anewcdl->Path()->MDate() << ")" << endm; } @@ -293,7 +293,7 @@ WOKBuilder_MSActionStatus WOKBuilder_MSTranslator::MSActionStatus(const Handle(W case WOKBuilder_PackageMethods: break; default: - ErrorMsg << "WOKBuilder_MSTranslator::MSActionStatus" + ErrorMsg() << "WOKBuilder_MSTranslator::MSActionStatus" << "Unknown action type : " << anid.Type() << endm; Standard_ProgramError::Raise("WOKBuilder_MSTranslator::MSActionStatus : Unknown action type"); break; @@ -316,7 +316,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::Translate(const Handle(WOKBuilde { if(mytranslator == NULL) { - ErrorMsg << "WOKBuilder_MSTranslator::Translate" << "Null Translator : Cannot Perform" << endm; + ErrorMsg() << "WOKBuilder_MSTranslator::Translate" << "Null Translator : Cannot Perform" << endm; return WOKBuilder_Failed; } @@ -327,7 +327,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::Translate(const Handle(WOKBuilde if((*mytranslator)(MSchema()->MetaSchema(),afile->Path()->Name(),globlist,unkowntypelist,instlist,genlist)) { - ErrorMsg << "WOKBuilder_MSTranslator::Translate" << "Errors occured" << endm; + ErrorMsg() << "WOKBuilder_MSTranslator::Translate" << "Errors occured" << endm; return WOKBuilder_Failed; } return WOKBuilder_Success; @@ -379,7 +379,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildPackage(const Handle(WOKBui { Handle(TColStd_HSequenceOfHAsciiString) uses, inctypes, insttypes, gentypes; - InfoMsg << "WOKBuilder_MSTranslator::BuildPackage" + InfoMsg() << "WOKBuilder_MSTranslator::BuildPackage" << "Package : " << afile->Path()->Name() << endm; switch(Translate(anaction, afile, uses, inctypes, insttypes, gentypes)) @@ -479,7 +479,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildPackage(const Handle(WOKBui } else { - WarningMsg << "WOKBuilder_MSTranslator::BuildPackage" + WarningMsg() << "WOKBuilder_MSTranslator::BuildPackage" << "Type " << fullname << " is not defined" << endm; //MSchema()->ChangeActionToFailed(theid); //return WOKBuilder_Failed; @@ -553,7 +553,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildSchema(const Handle(WOKBuil { Handle(TColStd_HSequenceOfHAsciiString) uses, inctypes, insttypes, gentypes; - InfoMsg << "WOKBuilder_MSEntityTranslatorIterator::Execute" + InfoMsg() << "WOKBuilder_MSEntityTranslatorIterator::Execute" << "Schema : " << afile->Path()->Name() << endm; switch(Translate(anaction, afile, uses, inctypes, insttypes, gentypes)) @@ -637,7 +637,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildInterface(const Handle(WOKB { Handle(TColStd_HSequenceOfHAsciiString) uses, inctypes, insttypes, gentypes; - InfoMsg << "WOKBuilder_MSEntityTranslatorIterator::Execute" + InfoMsg() << "WOKBuilder_MSEntityTranslatorIterator::Execute" << "Interface : " << afile->Path()->Name() << endm; switch(Translate(anaction, afile, uses, inctypes, insttypes, gentypes)) @@ -708,7 +708,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildClient(const Handle(WOKBuil { Handle(TColStd_HSequenceOfHAsciiString) uses, inctypes, insttypes, gentypes; - InfoMsg << "WOKBuilder_MSEntityTranslatorIterator::Execute" + InfoMsg() << "WOKBuilder_MSEntityTranslatorIterator::Execute" << "Client : " << afile->Path()->Name() << endm; switch(Translate(anaction, afile, uses, inctypes, insttypes, gentypes)) @@ -783,7 +783,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildEngine(const Handle(WOKBuil { Handle(TColStd_HSequenceOfHAsciiString) uses, inctypes, insttypes, gentypes; - InfoMsg << "WOKBuilder_MSTranslator::BuildEngine" + InfoMsg() << "WOKBuilder_MSTranslator::BuildEngine" << "Engine : " << afile->Path()->Name() << endm; switch(Translate(anaction, afile, uses, inctypes, insttypes, gentypes)) @@ -848,7 +848,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildSchUses(const Handle(WOKBui { Handle(TColStd_HSequenceOfHAsciiString) uses, inctypes, insttypes, gentypes; - InfoMsg << "WOKBuilder_MSTranslator::BuildDirectUses" + InfoMsg() << "WOKBuilder_MSTranslator::BuildDirectUses" << "Sch Uses : " << afile->Path()->Name() << endm; switch(Translate(anaction, afile, uses, inctypes, insttypes, gentypes)) @@ -940,7 +940,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildDirectUses(const Handle(WOK { Handle(TColStd_HSequenceOfHAsciiString) uses, inctypes, insttypes, gentypes; - InfoMsg << "WOKBuilder_MSTranslator::BuildDirectUses" + InfoMsg() << "WOKBuilder_MSTranslator::BuildDirectUses" << "Direct use : " << afile->Path()->Name() << endm; switch(Translate(anaction, afile, uses, inctypes, insttypes, gentypes)) @@ -1035,7 +1035,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildUses(const Handle(WOKBuilde { Handle(TColStd_HSequenceOfHAsciiString) uses, inctypes, insttypes, gentypes; - InfoMsg << "WOKBuilder_MSEntityTranslatorIterator::Execute" + InfoMsg() << "WOKBuilder_MSEntityTranslatorIterator::Execute" << "Used : " << afile->Path()->Name() << endm; switch(Translate(anaction, afile, uses, inctypes, insttypes, gentypes)) @@ -1113,7 +1113,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildGlobEnt(const Handle(WOKBui { Handle(TColStd_HSequenceOfHAsciiString) uses, inctypes, insttypes, gentypes; - InfoMsg << "WOKBuilder_MSEntityTranslatorIterator::Execute" + InfoMsg() << "WOKBuilder_MSEntityTranslatorIterator::Execute" << "Used : " << afile->Path()->Name() << endm; switch(Translate(anaction, afile, uses, inctypes, insttypes, gentypes)) @@ -1158,7 +1158,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildExecutable(const Handle(WOK { Handle(TColStd_HSequenceOfHAsciiString) uses, inctypes, insttypes, gentypes; - InfoMsg << "WOKBuilder_MSEntityTranslatorIterator::Execute" + InfoMsg() << "WOKBuilder_MSEntityTranslatorIterator::Execute" << "Executable : " << afile->Path()->Name() << endm; switch(Translate(anaction, afile, uses, inctypes, insttypes, gentypes)) @@ -1203,7 +1203,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildComponent(const Handle(WOKB { Handle(TColStd_HSequenceOfHAsciiString) uses, inctypes, insttypes, gentypes; - InfoMsg << "WOKBuilder_MSEntityTranslatorIterator::Execute" + InfoMsg() << "WOKBuilder_MSEntityTranslatorIterator::Execute" << "Component : " << afile->Path()->Name() << endm; switch(Translate(anaction, afile, uses, inctypes, insttypes, gentypes)) @@ -1276,7 +1276,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildPackageMethods(const Handle if(apk.IsNull()) { - ErrorMsg << "WOKBuilder_MSTranslatorIterator::BuildPackageMethods" + ErrorMsg() << "WOKBuilder_MSTranslatorIterator::BuildPackageMethods" << anaction->Entity()->Name() << " was not found or not an interface\n" << endm; return WOKBuilder_Failed; } @@ -1316,7 +1316,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildInterfaceTypes(const Handl if(aninter.IsNull()) { - ErrorMsg << "WOKBuilder_MSTranslatorIterator::BuildInterface" + ErrorMsg() << "WOKBuilder_MSTranslatorIterator::BuildInterface" << anaction->Entity()->Name() << " was not found or not an interface\n" << endm; return WOKBuilder_Failed; } @@ -1356,7 +1356,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildInterfaceTypes(const Handl } else { - ErrorMsg << "WOKBuilder_MSTranslator::BuildInterfaceTypes" + ErrorMsg() << "WOKBuilder_MSTranslator::BuildInterfaceTypes" << "Name " << name << " is not a package name or a type name and is exported in " << anaction->Entity()->Name() << endm; return WOKBuilder_Failed; } @@ -1379,7 +1379,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildSchemaTypes(const Handle(W if(aschema.IsNull()) { - ErrorMsg << "WOKBuilder_MSTranslatorIterator::BuildSchema" + ErrorMsg() << "WOKBuilder_MSTranslatorIterator::BuildSchema" << anaction->Entity()->Name() << " was not found or not an Schema\n" << endm; return WOKBuilder_Failed; } @@ -1432,7 +1432,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildInstToStd(const Handle(WOKB if(theGenTypes->Length() > instclass->InstTypes()->Length()) { - ErrorMsg << "WOKBuilder_MSTranslator::BuildInstToStd" + ErrorMsg() << "WOKBuilder_MSTranslator::BuildInstToStd" << "Wrong instantiation types number in " << instclass->FullName() << ": please remedy" << endm; return WOKBuilder_Failed; } @@ -1468,7 +1468,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildGenClass(const Handle(WOKBu { Handle(TColStd_HSequenceOfHAsciiString) uses, inctypes, insttypes, gentypes; - InfoMsg << "WOKBuilder_MSEntityTranslatorIterator::BuildGenClass" + InfoMsg() << "WOKBuilder_MSEntityTranslatorIterator::BuildGenClass" << "Generic : " << afile->Path()->Name() << endm; switch(Translate(anaction, afile, uses, inctypes, insttypes, gentypes)) @@ -1638,7 +1638,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildCompleteType(const Handle(W { Handle(TColStd_HSequenceOfHAsciiString) uses, inctypes, insttypes, gentypes; - InfoMsg << "WOKBuilder_MSEntityTranslatorIterator::BuildCompleteType" + InfoMsg() << "WOKBuilder_MSEntityTranslatorIterator::BuildCompleteType" << "Complete : " << afile->Path()->Name() << endm; switch(Translate(anaction, afile, uses, inctypes, insttypes, gentypes)) @@ -1729,7 +1729,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildSchemaType(const Handle(WOK { Handle(TColStd_HSequenceOfHAsciiString) uses, inctypes, insttypes, gentypes; - InfoMsg << "WOKBuilder_MSEntityTranslatorIterator::BuildSchemaType" + InfoMsg() << "WOKBuilder_MSEntityTranslatorIterator::BuildSchemaType" << "Schema Type : " << afile->Path()->Name() << endm; switch(Translate(anaction, afile, uses, inctypes, insttypes, gentypes)) @@ -1821,7 +1821,7 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildTypeUsed(const Handle(WOKBu { Handle(TColStd_HSequenceOfHAsciiString) uses, inctypes, insttypes, gentypes; - InfoMsg << "WOKBuilder_MSEntityTranslatorIterator::BuildTypeUsed" + InfoMsg() << "WOKBuilder_MSEntityTranslatorIterator::BuildTypeUsed" << "Type used : " << afile->Path()->Name() << endm; switch(Translate(anaction, afile, uses, inctypes, insttypes, gentypes)) @@ -1909,147 +1909,147 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::Execute(const Handle(WOKBuilder_ { case WOKBuilder_Package: WOK_TRACE { - VerboseMsg("WOK_TRANSIT") << "WOKBuilder_MSTranslatorIterator::Execute" + VerboseMsg()("WOK_TRANSIT") << "WOKBuilder_MSTranslatorIterator::Execute" << "Package : " << anaction->Entity()->Name() <Entity()->Name() <Entity()->Name() <Entity()->Name() <Entity()->Name() <Entity()->Name() <Entity()->Name() <Entity()->Name() <Entity()->Name() <Entity()->Name() <Entity()->Name() <Entity()->Name() <Entity()->Name() <Entity()->Name() <Entity()->Name() <Entity()->Name() <Entity()->Name() <Entity()->Name() <Entity()->Name() <Entity()->Name() <Entity()->Name() <Value(i) << endm; } myschema->RemoveType(toshoot->Value(i), Standard_False); @@ -898,7 +898,7 @@ Handle(TColStd_HSequenceOfHAsciiString) WOKBuilder_MSchema::SortedSchemaClasses( if(aclass.IsNull()) { - ErrorMsg << "WOKBuilder_MSchema::SortedSchemaClasses" + ErrorMsg() << "WOKBuilder_MSchema::SortedSchemaClasses" << "Name " << aseq->Value(i) << " is not a known class name" << endm; Handle(TColStd_HSequenceOfHAsciiString) result; return result; @@ -1036,7 +1036,7 @@ Handle(WOKBuilder_MSAction) WOKBuilder_MSchema::GetAction(const WOKBuilder_MSAct } WOK_TRACE { - VerboseMsg("WOK_MSCHEMA") << "WOKBuilder_MSchema::GetAction" + VerboseMsg()("WOK_MSCHEMA") << "WOKBuilder_MSchema::GetAction" << "Created Action " << theid.Name() << endm; } @@ -1047,7 +1047,7 @@ Handle(WOKBuilder_MSAction) WOKBuilder_MSchema::GetAction(const WOKBuilder_MSAct theresult = myactions.Find(theid); WOK_TRACE { - VerboseMsg("WOK_MSCHEMA") << "WOKBuilder_MSchema::GetAction" + VerboseMsg()("WOK_MSCHEMA") << "WOKBuilder_MSchema::GetAction" << "Found Action " << theid.Name() << " with date : " << (Standard_Integer) theresult->Date()<< endm; } @@ -1083,7 +1083,7 @@ void WOKBuilder_MSchema::ChangeActionToFailed(const WOKBuilder_MSActionID& anid) theaction->SetStatus(WOKBuilder_HasFailed); WOK_TRACE { - VerboseMsg("WOK_MSCHEMA") << "WOKBuilder_MSchema::" + VerboseMsg()("WOK_MSCHEMA") << "WOKBuilder_MSchema::" << "Failed Action " << theid.Name() << endm; } return; @@ -1113,7 +1113,7 @@ void WOKBuilder_MSchema::ChangeAddAction(const WOKBuilder_MSActionID& anid, cons theaction->SetStatus(WOKBuilder_UpToDate); WOK_TRACE { - VerboseMsg("WOK_MSCHEMA") << "WOKBuilder_MSchema::ChangeAddAction" + VerboseMsg()("WOK_MSCHEMA") << "WOKBuilder_MSchema::ChangeAddAction" << "Added Action " << theid.Name() << " with date " << (Standard_Integer) theaction->Date() << endm; } return; @@ -1131,14 +1131,14 @@ WOKBuilder_MSActionStatus WOKBuilder_MSchema::GetActionStatus(const WOKBuilder_M if(!myactions.IsBound(theid)) { WOK_TRACE { - VerboseMsg("WOK_MSCHEMA") << "WOKBuilder_MSchema::GetActionStatus" + VerboseMsg()("WOK_MSCHEMA") << "WOKBuilder_MSchema::GetActionStatus" << "Could not get Action " << theid.Name() << endm; } return WOKBuilder_NotDefined; } WOK_TRACE { - VerboseMsg("WOK_MSCHEMA") << "WOKBuilder_MSchema::GetActionStatus" + VerboseMsg()("WOK_MSCHEMA") << "WOKBuilder_MSchema::GetActionStatus" << "Got Action " << theid.Name() << endm; } diff --git a/src/WOKBuilder/WOKBuilder_ToolInProcess.cxx b/src/WOKBuilder/WOKBuilder_ToolInProcess.cxx index 6132661..69ec0e0 100755 --- a/src/WOKBuilder/WOKBuilder_ToolInProcess.cxx +++ b/src/WOKBuilder/WOKBuilder_ToolInProcess.cxx @@ -33,7 +33,7 @@ void WOKBuilder_ToolInProcess::Load(const Handle(WOKUtils_Path)& alibrary, libpath = Params().SearchFile(alibrary->Name()); if(libpath.IsNull()) { - ErrorMsg << "WOKBuilder_ToolInProcess::Load" + ErrorMsg() << "WOKBuilder_ToolInProcess::Load" << "Could not find file : " << alibrary->Name() << endm; return; } @@ -48,7 +48,7 @@ void WOKBuilder_ToolInProcess::Load(const Handle(WOKUtils_Path)& alibrary, if(mylib.DlOpen(OSD_RTLD_LAZY) == Standard_False) { - ErrorMsg << "WOKBuilder_ToolInProcess" << mylib.DlError() << endm; + ErrorMsg() << "WOKBuilder_ToolInProcess" << mylib.DlError() << endm; Standard_ProgramError::Raise("WOKBuilder_ToolInProcess"); } @@ -56,8 +56,8 @@ void WOKBuilder_ToolInProcess::Load(const Handle(WOKUtils_Path)& alibrary, if(myfunc == NULL) { - ErrorMsg << "WOKBuilder_ToolInProcess" << mylib.DlError() << endm; - ErrorMsg << "WOKBuilder_ToolInProcess" << "Error in DlSymb of : " << afunc << endm; + ErrorMsg() << "WOKBuilder_ToolInProcess" << mylib.DlError() << endm; + ErrorMsg() << "WOKBuilder_ToolInProcess" << "Error in DlSymb of : " << afunc << endm; Standard_ProgramError::Raise("WOKBuilder_ToolInProcess"); } SetLoaded(); diff --git a/src/WOKBuilder/WOKBuilder_ToolInShell.cxx b/src/WOKBuilder/WOKBuilder_ToolInShell.cxx index 7fbebde..67f4789 100755 --- a/src/WOKBuilder/WOKBuilder_ToolInShell.cxx +++ b/src/WOKBuilder/WOKBuilder_ToolInShell.cxx @@ -181,7 +181,7 @@ Handle(TCollection_HAsciiString) WOKBuilder_ToolInShell::OptionLine() const { if(!Params().IsSet(args->Value(i)->ToCString())) { - ErrorMsg << "WOKBuilder_ToolInShell::OptionLine" + ErrorMsg() << "WOKBuilder_ToolInShell::OptionLine" << "Could not eval ToolInShell option argument : " << args->Value(i)->ToCString() << endm; return result; } @@ -211,7 +211,7 @@ Handle(WOKBuilder_HSequenceOfEntity) WOKBuilder_ToolInShell::EvalProduction() co if(prodlist.IsNull()) { - ErrorMsg << "WOKBuilder_ToolInShell::EvalProduction" + ErrorMsg() << "WOKBuilder_ToolInShell::EvalProduction" << "Coul not eval production of " << Name() << endm; return nullseq; } diff --git a/src/WOKBuilder/WOKBuilder_ToolInShellIterator.cxx b/src/WOKBuilder/WOKBuilder_ToolInShellIterator.cxx index 74cb351..a975589 100755 --- a/src/WOKBuilder/WOKBuilder_ToolInShellIterator.cxx +++ b/src/WOKBuilder/WOKBuilder_ToolInShellIterator.cxx @@ -162,7 +162,7 @@ Standard_Integer WOKBuilder_ToolInShellIterator::LoadGroup() if(mygroup.IsNull()) { - ErrorMsg << "WOKBuilder_ToolInShellIterator::LoadGroup" + ErrorMsg() << "WOKBuilder_ToolInShellIterator::LoadGroup" << "Cannot not load an unamed tool group" << endm; return 1; } @@ -175,7 +175,7 @@ Standard_Integer WOKBuilder_ToolInShellIterator::LoadGroup() if(toolsnames.IsNull()) { - ErrorMsg << "WOKBuilder_ToolInShellIterator::LoadGroup" + ErrorMsg() << "WOKBuilder_ToolInShellIterator::LoadGroup" << "Cannot not eval tool list for group : " << mygroup << " (parameter : " << varname << ")" << endm; return 1; } @@ -192,7 +192,7 @@ Standard_Integer WOKBuilder_ToolInShellIterator::LoadGroup() if(atool.IsNull()) { - ErrorMsg << "WOKBuilder_ToolInShellIterator::LoadGroup" + ErrorMsg() << "WOKBuilder_ToolInShellIterator::LoadGroup" << "Cannot not get Tool : " << toolname << endm; return 1; } @@ -213,10 +213,10 @@ Standard_Integer WOKBuilder_ToolInShellIterator::LoadGroup() { Handle(WOKBuilder_ToolInShell) prevtool = myexts.Find(extseq->Value(j)); - WarningMsg << "WOKBuilder_ToolInShellIterator::LoadGroup" + WarningMsg() << "WOKBuilder_ToolInShellIterator::LoadGroup" << "Extension " << extseq->Value(j) << " is already recognized by " << prevtool->Name() << endm; - WarningMsg << "WOKBuilder_ToolInShellIterator::LoadGroup" + WarningMsg() << "WOKBuilder_ToolInShellIterator::LoadGroup" << "It is ignored for " << atool->Name() << endm; } else @@ -270,14 +270,14 @@ Handle(WOKBuilder_ToolInShell) WOKBuilder_ToolInShellIterator::AppropriateTool(c if(anent.IsNull()) { - ErrorMsg << "WOKBuilder_ToolInShellIterator::AppropriateTool" + ErrorMsg() << "WOKBuilder_ToolInShellIterator::AppropriateTool" << "Cannot determine Tool for Null Entity" << endm; return NULLTOOL; } if(anent->Path().IsNull()) { - ErrorMsg << "WOKBuilder_ToolInShellIterator::AppropriateTool" + ErrorMsg() << "WOKBuilder_ToolInShellIterator::AppropriateTool" << "Cannot determine Tool for Null path entity" << endm; return NULLTOOL; } diff --git a/src/WOKBuilder/WOKBuilder_WNTCollector.cxx b/src/WOKBuilder/WOKBuilder_WNTCollector.cxx index 679dc42..ae353f7 100755 --- a/src/WOKBuilder/WOKBuilder_WNTCollector.cxx +++ b/src/WOKBuilder/WOKBuilder_WNTCollector.cxx @@ -48,7 +48,7 @@ Standard_Boolean WOKBuilder_WNTCollector::OpenCommandFile() if(ext.IsNull()) { - ErrorMsg << "WOKBuilder_WNTCollector::OpenCommandFile" + ErrorMsg() << "WOKBuilder_WNTCollector::OpenCommandFile" << "Could not evaluate extension for tool command file" << endm; } else { @@ -60,7 +60,7 @@ Standard_Boolean WOKBuilder_WNTCollector::OpenCommandFile() if(myCommandFile.Failed()) { - ErrorMsg << "WOKBuilder_WNTCollector :: OpenCommandFile" + ErrorMsg() << "WOKBuilder_WNTCollector :: OpenCommandFile" << "Could not create tool command file '" << fileName << "' - " << endm; myCommandFile.Perror (); } @@ -78,7 +78,7 @@ Standard_Boolean WOKBuilder_WNTCollector::CloseCommandFile() if(myCommandFile.Failed()) { - ErrorMsg << "WOKBuilder_WNTCollector :: OpenCommandFile" + ErrorMsg() << "WOKBuilder_WNTCollector :: OpenCommandFile" << "Could not create tool command file - " << endm; myCommandFile.Perror (); } @@ -137,22 +137,22 @@ WOKBuilder_BuildStatus WOKBuilder_WNTCollector::Execute() if(Shell()->Status()) { - Standard_Boolean ph = ErrorMsg.PrintHeader(); + Standard_Boolean ph = ErrorMsg().PrintHeader(); - ErrorMsg << "WOKBuilder_WNTCollector :: Execute" << "Errors Occured :" << endm; + ErrorMsg() << "WOKBuilder_WNTCollector :: Execute" << "Errors Occured :" << endm; errmsgs = Shell()->Errors(); - ErrorMsg.DontPrintHeader(); + ErrorMsg().DontPrintHeader(); for( i=1; i<=errmsgs->Length(); i++) { if(linkerLogo->Match(errmsgs->Value(i)) != -1) continue; - ErrorMsg << "WOKBuilder_WNTCollector :: Execute" << errmsgs -> Value ( i ) << endm; + ErrorMsg() << "WOKBuilder_WNTCollector :: Execute" << errmsgs -> Value ( i ) << endm; } - if(ph) ErrorMsg.DoPrintHeader(); + if(ph) ErrorMsg().DoPrintHeader(); _print_output("Failed : ", this); @@ -163,9 +163,9 @@ WOKBuilder_BuildStatus WOKBuilder_WNTCollector::Execute() else { Handle(WOKBuilder_Entity) ent; - Standard_Boolean ph = InfoMsg.PrintHeader(); + Standard_Boolean ph = InfoMsg().PrintHeader(); - InfoMsg << "WOKBuilder_WNTCollector::Execute" << "Succeeded : "; + InfoMsg() << "WOKBuilder_WNTCollector::Execute" << "Succeeded : "; for( i=1; i<=Produces()->Length(); ++i) { @@ -175,11 +175,11 @@ WOKBuilder_BuildStatus WOKBuilder_WNTCollector::Execute() prodPath = ent->Path(); if(prodPath->Exists()) - InfoMsg << prodPath->FileName() << " "; + InfoMsg() << prodPath->FileName() << " "; } - InfoMsg << endm; - InfoMsg.DontPrintHeader(); + InfoMsg() << endm; + InfoMsg().DontPrintHeader(); errmsgs = Shell()->Errors(); @@ -187,10 +187,10 @@ WOKBuilder_BuildStatus WOKBuilder_WNTCollector::Execute() { if(linkerLogo->Match(errmsgs->Value(i))!=-1) continue; - InfoMsg << "WOKBuilder_WNTCollector::Execute" << errmsgs->Value(i) << endm; + InfoMsg() << "WOKBuilder_WNTCollector::Execute" << errmsgs->Value(i) << endm; } - if(ph) InfoMsg.DoPrintHeader(); + if(ph) InfoMsg().DoPrintHeader(); } Shell()->ClearOutput(); @@ -226,7 +226,7 @@ static void FASTCALL _print_output( Standard_CString msg, WOKBuilder_Tool* tool { Handle(WOKBuilder_Entity) ent; - InfoMsg << "WOKBuilder_WNTCollector::Execute" + InfoMsg() << "WOKBuilder_WNTCollector::Execute" << msg; for(Standard_Integer i=1; i<=tool->Produces()->Length(); ++i) @@ -235,8 +235,8 @@ static void FASTCALL _print_output( Standard_CString msg, WOKBuilder_Tool* tool if(ent->IsKind(STANDARD_TYPE(WOKBuilder_ExportLibrary))) continue; - InfoMsg << ent -> Path () -> FileName () << " "; + InfoMsg() << ent -> Path () -> FileName () << " "; } - InfoMsg << endm; + InfoMsg() << endm; } -- 2.39.5