From: inv Date: Thu, 12 Aug 2010 11:25:13 +0000 (+0000) Subject: OCC21758 Dump of "maxtolerance" command contains unexpected symbols. X-Git-Tag: V6_7_1~126 X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=89b2206258e5bbdbc42664636664ddc3d18b8f4f;p=occt-wok.git OCC21758 Dump of "maxtolerance" command contains unexpected symbols. --- diff --git a/src/CPPIntExt/Interface_Template.edl b/src/CPPIntExt/Interface_Template.edl index 2699286..18e8121 100755 --- a/src/CPPIntExt/Interface_Template.edl +++ b/src/CPPIntExt/Interface_Template.edl @@ -277,7 +277,7 @@ $ $ $ default: $ Err << ErrMsg; aSignature->Display(Err); Err << (char) 0; -$ Engine::Return(GetSString(Err),-1); +$ Engine::Return(Err,-1); $ Eng_Status = Engine_Error; $ break; $ } @@ -292,15 +292,14 @@ $ Err << "Exception: "; $ aSignature->Display(Err); $ Err << ": raises the exception: " $ <= %IntMaxCase)) { $ Err << ErrMsg; aSignature->Display(Err); Err << (char) 0; -$ Engine::Return(GetSString(Err),-1); +$ Engine::Return(Err,-1); $ Eng_Status = Engine_Error; $ } $ @@ -326,14 +325,14 @@ $ aSignature->Display(Err); $ Err << ": raises the exception: " $ < Returns ().IsNull () ) { @@ -1589,7 +1589,7 @@ void CPPJini_ReturnBuilder ( } else { - objType = (char *)RetInDecl -> ToCString (); + objType = RetInDecl -> ToCString (); RetInCall -> AssignCat ( " thejret = " ); RetInCall -> AssignCat ( MethodCall ); RetInCall -> AssignCat ( ";\n" ); diff --git a/src/CPPJini/CPPJini_General.edl b/src/CPPJini/CPPJini_General.edl index 2817b2e..5d37683 100755 --- a/src/CPPJini/CPPJini_General.edl +++ b/src/CPPJini/CPPJini_General.edl @@ -81,10 +81,7 @@ $try { $%MBody $} $catch (Standard_Failure) { -$ Standard_SStream Err; -$ Err << Standard_Failure::Caught(); -$ Err << (char) 0; -$ jcas_ThrowException(env,GetSString(Err)); +$ jcas_ThrowException(env,Standard_Failure::Caught()->GetMessageString()); $} $} $alock.Release(); @@ -104,10 +101,7 @@ $try { $%MBody $} $catch (Standard_Failure) { -$ Standard_SStream Err; -$ Err << Standard_Failure::Caught(); -$ Err << (char) 0; -$ jcas_ThrowException(env,GetSString(Err)); +$ jcas_ThrowException(env,Standard_Failure::Caught()->GetMessageString()); $} $OS_END_FAULT_HANDLER; $} diff --git a/src/WOKAPI/WOKAPI_Session.cxx b/src/WOKAPI/WOKAPI_Session.cxx index b4c8e6a..3412a75 100755 --- a/src/WOKAPI/WOKAPI_Session.cxx +++ b/src/WOKAPI/WOKAPI_Session.cxx @@ -329,12 +329,10 @@ void WOKAPI_Session::GeneralFailure(const Handle(Standard_Failure)& ) } catch(Standard_Failure) { Handle(Standard_Failure) E = Standard_Failure::Caught(); - Standard_SStream astream; - astream << E << ends; ErrorMsg() << "WOKAPI_Session::GeneralFailure" - << "Exception was raised : " << GetSString(astream) << endm; + << "Exception was raised : " << E->GetMessageString() << endm; ErrorMsg() << "WOKAPI_Session::GeneralFailure" - << "Could not recover session after Failure : Session is reinitialized" << endm; + << "Could not recover session after Failure : Session is reinitialized" << endm; WOKUtils_ProcessManager::UnArm(); WOKMake_TriggerStep::CurrentTriggerStep() = Handle(WOKMake_TriggerStep)(); diff --git a/src/WOKLibs/wokcmd.cxx b/src/WOKLibs/wokcmd.cxx index e43c537..ac09e47 100755 --- a/src/WOKLibs/wokcmd.cxx +++ b/src/WOKLibs/wokcmd.cxx @@ -153,9 +153,7 @@ int Wok_Init(WOKTclTools_PInterp interp) } catch(Standard_Failure) { Handle(Standard_Failure) E = Standard_Failure::Caught(); - Standard_SStream astream; - astream << E << ends; - ErrorMsg() << "WOKTCL_AppInit" << "Exception was raised : " << GetSString(astream) << endm; + ErrorMsg() << "WOKTCL_AppInit" << "Exception was raised : " << E->GetMessageString() << endm; WOKUtils_ProcessManager::UnArm(); return TCL_ERROR; } diff --git a/src/WOKMake/WOKMake_BuildProcessIterator.cxx b/src/WOKMake/WOKMake_BuildProcessIterator.cxx index 91d4289..0fe0b46 100755 --- a/src/WOKMake/WOKMake_BuildProcessIterator.cxx +++ b/src/WOKMake/WOKMake_BuildProcessIterator.cxx @@ -227,10 +227,7 @@ WOKMake_Status WOKMake_BuildProcessIterator::MakeStep() } else { - Standard_SStream astream; - astream << E << ends; - - ErrorMsg() << "WOKMake_BuildProcessIterator::MakeStep" << "Exception was raised : " << GetSString(astream) << endm; + ErrorMsg() << "WOKMake_BuildProcessIterator::MakeStep" << "Exception was raised : " << E->GetMessageString() << endm; } } diff --git a/src/WOKSH/wokprocess.cxx b/src/WOKSH/wokprocess.cxx index a85d9db..8f8fa97 100755 --- a/src/WOKSH/wokprocess.cxx +++ b/src/WOKSH/wokprocess.cxx @@ -120,9 +120,7 @@ int main(int argc, char **argv) } catch(Standard_Failure) { Handle(Standard_Failure) E = Standard_Failure::Caught(); - Standard_SStream astream; - astream << E << ends; - ErrorMsg() << "WOKTCL_AppInit" << "Exception was raised : " << GetSString(astream) << endm; + ErrorMsg() << "WOKTCL_AppInit" << "Exception was raised : " << E->GetMessageString() << endm; WOKUtils_ProcessManager::UnArm(); return TCL_ERROR; } diff --git a/src/WOKSH/woksh.cxx b/src/WOKSH/woksh.cxx index 53d0097..df5b698 100755 --- a/src/WOKSH/woksh.cxx +++ b/src/WOKSH/woksh.cxx @@ -174,9 +174,7 @@ int Wok_Init(WOKTclTools_PInterp interp) } catch(Standard_Failure) { Handle(Standard_Failure) E = Standard_Failure::Caught(); - Standard_SStream astream; - astream << E << ends; - ErrorMsg() << "WOKTCL_AppInit" << "Exception was raised : " << GetSString(astream) << endm; + ErrorMsg() << "WOKTCL_AppInit" << "Exception was raised : " << E->GetMessageString() << endm; WOKUtils_ProcessManager::UnArm(); return TCL_ERROR; } diff --git a/src/WOKTCL/WOKTCL_DefaultCommand.cxx b/src/WOKTCL/WOKTCL_DefaultCommand.cxx index eaeaec6..eafc9e3 100755 --- a/src/WOKTCL/WOKTCL_DefaultCommand.cxx +++ b/src/WOKTCL/WOKTCL_DefaultCommand.cxx @@ -95,15 +95,12 @@ Standard_Integer DefaultCommand(ClientData clientData, Tcl_Interp *, } catch (Standard_Failure) { Handle(Standard_Failure) E = Standard_Failure::Caught(); - - Standard_SStream astream; - astream << E << ends; // MKV 24.08.05 #if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))) && !defined(USE_NON_CONST) - ErrorMsg() << (char*)argv[0] << "Exception was raised : " << GetSString(astream) << endm; + ErrorMsg() << (char*)argv[0] << "Exception was raised : " << E->GetMessageString() << endm; #else - ErrorMsg() << argv[0] << "Exception was raised : " << GetSString(astream) << endm; + ErrorMsg() << argv[0] << "Exception was raised : " << E->GetMessageString() << endm; #endif WOKAPI_Session* asess = (WOKAPI_Session *) &(C->i->Session()); diff --git a/src/WOKTclTools/WOKTclTools_Interpretor.cxx b/src/WOKTclTools/WOKTclTools_Interpretor.cxx index fea7b3f..13805ba 100755 --- a/src/WOKTclTools/WOKTclTools_Interpretor.cxx +++ b/src/WOKTclTools/WOKTclTools_Interpretor.cxx @@ -132,13 +132,11 @@ static Standard_Integer WOKCommand(ClientData clientData, Tcl_Interp *, catch (Standard_Failure) { Handle(Standard_Failure) E = Standard_Failure::Caught(); - Standard_SStream astream; - astream << E << ends; // MKV 24.08.05 #if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))) && !defined(USE_NON_CONST) - ErrorMsg() << (char*)argv[0] << "Exception was raised : " << GetSString(astream) << endm; + ErrorMsg() << (char*)argv[0] << "Exception was raised : " << E->GetMessageString() << endm; #else - ErrorMsg() << argv[0] << "Exception was raised : " << GetSString(astream) << endm; + ErrorMsg() << argv[0] << "Exception was raised : " << E->GetMessageString() << endm; #endif WOKUtils_ProcessManager::UnArm(); return TCL_ERROR; @@ -780,7 +778,7 @@ void WOKTclTools_Interpretor::TreatMessage(const Standard_Boolean newline, { if (!newline) { - Standard_Character* argv[5]; + Standard_CString argv[5]; int argc = 4; argv[0] = "puts"; argv[2] = "stderr"; @@ -804,7 +802,7 @@ void WOKTclTools_Interpretor::TreatMessage(const Standard_Boolean newline, } else { - Standard_Character* argv[4]; + Standard_CString argv[4]; int argc = 3; argv[0] = "puts"; argv[1] = "stderr"; diff --git a/src/WOKernel/WOKernel_DevUnit.cxx b/src/WOKernel/WOKernel_DevUnit.cxx index 7370bec..abe725e 100755 --- a/src/WOKernel/WOKernel_DevUnit.cxx +++ b/src/WOKernel/WOKernel_DevUnit.cxx @@ -1037,10 +1037,7 @@ Handle(TColStd_HSequenceOfHAsciiString) WOKernel_DevUnit::ImplementationDep(cons catch (Standard_Failure ) { Handle(Standard_Failure) E = Standard_Failure::Caught(); - Standard_SStream astream; - astream << E << ends; - - ErrorMsg() << "WOKernel_DevUnit::ImplementationDep" << "Exception was raised : " << GetSString(astream) << endm; + ErrorMsg() << "WOKernel_DevUnit::ImplementationDep" << "Exception was raised : " << E->GetMessageString() << endm; return NULLRESULT ; } return NULLRESULT; @@ -1139,10 +1136,7 @@ Handle(TColStd_HSequenceOfHAsciiString) WOKernel_DevUnit::ImplClients(const Hand catch (Standard_Failure ) { Handle(Standard_Failure) E = Standard_Failure::Caught(); - Standard_SStream astream; - astream << E << ends; - - ErrorMsg() << "WOKernel_DevUnit::ImplClients" << "Exception was raised : " << GetSString(astream) << endm; + ErrorMsg() << "WOKernel_DevUnit::ImplClients" << "Exception was raised : " << E->GetMessageString() << endm; return NULLRESULT ; } return NULLRESULT ;