OCC21758 Dump of "maxtolerance" command contains unexpected symbols.

diff --git a/src/CPPIntExt/Interface_Template.edl b/src/CPPIntExt/Interface_Template.edl
index 269928602ce461126de12dbd66549a57b350ff83..18e8121f587f2c8b83f66fce6b70f8d8e9f8fbad 100755 (executable)
--- 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: "                                   
 $          <<Standard_Failure::Caught();                                     
-$      Err << (char) 0;                                                      
-$      Engine::Return(GetSString(Err),-1);                                
+$      Engine::Return(Err,-1);
 $      Eng_Status = Engine_Exception;                                        
 $    }                                                                       
 $  }                                                                         
 $                                                                            
 $  switch(Eng_Status) {                                                      
-$    case Engine_Exception:Engine_MethodException::Raise(GetSString(Err));
-$    case Engine_Error    :Engine_ExecutionError::Raise(GetSString(Err)); 
+$    case Engine_Exception:Engine_MethodException::Raise(Err);
+$    case Engine_Error    :Engine_ExecutionError::Raise(Err); 
 $    default:
 $      break;  
 $  }                                                                         
@@ -311,7 +310,7 @@ $}
 $                                                              
 $      if ((theCase <= 0)  || (theCase >= %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: "                                   
 $          <<Standard_Failure::Caught();                                     
 $      Err << (char) 0;                                                      
-$      Engine::Return(GetSString(Err),-1);                                
+$      Engine::Return(Err,-1);                                
 $      Eng_Status = Engine_Exception;                                        
 $    }                                                                       
 $  }                                                                         
 $                                                                            
 $  switch(Eng_Status) {                                                      
-$    case Engine_Exception:Engine_MethodException::Raise(GetSString(Err));
-$    case Engine_Error    :Engine_ExecutionError::Raise(GetSString(Err)); 
+$    case Engine_Exception:Engine_MethodException::Raise(Err);
+$    case Engine_Error    :Engine_ExecutionError::Raise(Err); 
 $    default:
 $      break;  
 $  }                                                                         

diff --git a/src/CPPJini/CPPJini.cxx b/src/CPPJini/CPPJini.cxx
index 74233c4fda84011e998f5bec316570d3dab4bcbe..9342cd781dd5d1966c530eca5f3ba535089f349e 100755 (executable)
--- a/src/CPPJini/CPPJini.cxx
+++ b/src/CPPJini/CPPJini.cxx
@@ -1536,7 +1536,7 @@ void CPPJini_ReturnBuilder (
             Handle( TCollection_HAsciiString )& RetOut
      ) {
 
- char* objType = "jobject";
+const  char* objType = "jobject";
 
  if (  !m -> 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 2817b2e43199aec1f22411a094ae2b318d292271..5d3768336159408c79d4bbb3b52a77f637f00333 100755 (executable)
--- 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 b4c8e6ad5663a16d163be45b623a543fa6b3c8f2..3412a75f5f73e273308a1b79196b5defa51e8ae9 100755 (executable)
--- 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 e43c53759d31666b36b2a479dad80e5d59359681..ac09e4785abaed376308d010a8351a8cce7e6113 100755 (executable)
--- 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 91d42890b858ec23b56dbeb0f7e7b8ff882bcc5e..0fe0b4653c895fd6db7dbef6ddefa7232767afa1 100755 (executable)
--- 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 a85d9dbcca112ee3d5245397fcd04a4c33ee4e50..8f8fa97ef609ddb7b5a27e1727f76f29ecdc5bf9 100755 (executable)
--- 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 53d00978626d6e7680281fbdceff0f5e01ab7869..df5b698b9bffe28e3e5e9f2eda8c8bb0d45590b5 100755 (executable)
--- 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 eaeaec6456f67af201d130a68e2d1f6e00a40449..eafc9e36f674cc2bbe2f8bc154a67afa7640de24 100755 (executable)
--- 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 fea7b3fe561b595e826e732ce96dd676c7c9aa72..13805ba1c87d1aa1edfabbbdd3f4a848d8d33eaf 100755 (executable)
--- 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 7370becfb4d290fffc1be08e01173ff1985867dd..abe725ea70409d6b2f64931a7735e088d2a203a6 100755 (executable)
--- 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 ;