OCC20850 umake command do not work on SunOS10

diff --git a/src/WOKTCL/WOKTCL_DefaultCommand.cxx b/src/WOKTCL/WOKTCL_DefaultCommand.cxx
index d6e93fffd80140d6f525eaae960f55b3a21d6909..eaeaec6456f67af201d130a68e2d1f6e00a40449 100755 (executable)
--- a/src/WOKTCL/WOKTCL_DefaultCommand.cxx
+++ b/src/WOKTCL/WOKTCL_DefaultCommand.cxx
@@ -41,9 +41,6 @@
 #define WOK_SESSION_KEEP 1
 #endif
 
-//extern Standard_IMPORT Handle(WOKTclTools_Interpretor) CurrentInterp;
-Standard_IMPORT Handle(WOKTclTools_Interpretor) CurrentInterp;
-
 // MKV 24.08.05
 #if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))) && !defined(USE_NON_CONST)
 Standard_Integer DefaultCommand(ClientData clientData, Tcl_Interp *, 
@@ -53,6 +50,8 @@ Standard_Integer DefaultCommand(ClientData clientData, Tcl_Interp *,
                                Standard_Integer argc, char* argv[])
 #endif
 {
+  Handle(WOKTclTools_Interpretor)& CurrentInterp = WOKTclTools_Interpretor::Current();
+
   volatile Standard_Integer status = 0;
 
   CData* C = (CData*) clientData;
@@ -102,9 +101,9 @@ Standard_Integer DefaultCommand(ClientData clientData, Tcl_Interp *,
 
     // 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 : " << GetSString(astream) << endm;
 #else
-    ErrorMsg << argv[0] << "Exception was raised : " << GetSString(astream) << endm;
+    ErrorMsg() << argv[0] << "Exception was raised : " << GetSString(astream) << endm;
 #endif
 
     WOKAPI_Session* asess = (WOKAPI_Session *) &(C->i->Session());

diff --git a/src/WOKTCL/WOKTCL_Interpretor.cxx b/src/WOKTCL/WOKTCL_Interpretor.cxx
index 649c41784c9ffd2d0c66d6b7e8c8760c8a191da1..f867cfd26602d15bf018a89dd2ebb14929de3f4a 100755 (executable)
--- a/src/WOKTCL/WOKTCL_Interpretor.cxx
+++ b/src/WOKTCL/WOKTCL_Interpretor.cxx
@@ -28,9 +28,6 @@
 
 #include <WOKTCL_DefaultCommand.hxx>
 
-//extern Standard_IMPORT Handle(WOKTclTools_Interpretor) CurrentInterp;
-Standard_IMPORT Handle(WOKTclTools_Interpretor) CurrentInterp;
-
 //=======================================================================
 //function : WOKTCL_Interpretor
 //purpose  : 

diff --git a/src/WOKTCL/WOKTCL_TriggerHandler.cxx b/src/WOKTCL/WOKTCL_TriggerHandler.cxx
index 402ac8b4874af722b84fc22834e9c5a39d7e6e96..10e72cbce5d20ee1783393408ff5879c5138811f 100755 (executable)
--- a/src/WOKTCL/WOKTCL_TriggerHandler.cxx
+++ b/src/WOKTCL/WOKTCL_TriggerHandler.cxx
@@ -17,13 +17,12 @@
 
 #include <tcl.h>
 
-//extern Standard_IMPORT Handle(WOKTclTools_Interpretor) CurrentInterp;
-Standard_IMPORT Handle(WOKTclTools_Interpretor) CurrentInterp;
-
 Standard_EXPORT WOKUtils_TriggerStatus WOKTCL_TriggerHandler(WOKUtils_Trigger &atrigger)
 {  
   Standard_Integer i;
 
+  Handle(WOKTclTools_Interpretor)& CurrentInterp = WOKTclTools_Interpretor::Current();
+
   const WOKTools_Return& args = atrigger.Args();
 
   for(i = 1; i <= args.Length() ; i++) 
@@ -39,7 +38,7 @@ Standard_EXPORT WOKUtils_TriggerStatus WOKTCL_TriggerHandler(WOKUtils_Trigger &a
            if(afile->InterpType() == WOKTools_TclInterp)
              {
                WOK_TRACE {
-                 VerboseMsg("WOK_TRIGGER") << "WOKTCL_TriggerHandler" 
+                 VerboseMsg()("WOK_TRIGGER") << "WOKTCL_TriggerHandler" 
                                            << "LoadFile : " << afile->File() << endm;
                }
                CurrentInterp->EvalFile(afile->File()->ToCString());
@@ -58,7 +57,7 @@ Standard_EXPORT WOKUtils_TriggerStatus WOKTCL_TriggerHandler(WOKUtils_Trigger &a
          Handle(TCollection_HAsciiString) acmd = new TCollection_HAsciiString(atrigger.Name());
          
          WOK_TRACE {
-           VerboseMsg("WOK_TRIGGER") << "WOKTCL_TriggerHandler" << "Handler called for trigger : " << atrigger.Name() << endm;
+           VerboseMsg()("WOK_TRIGGER") << "WOKTCL_TriggerHandler" << "Handler called for trigger : " << atrigger.Name() << endm;
            
            // Prise en compte des resultats
            const WOKTools_Return& args = atrigger.Args();
@@ -72,7 +71,7 @@ Standard_EXPORT WOKUtils_TriggerStatus WOKTCL_TriggerHandler(WOKUtils_Trigger &a
                  case WOKTools_String:
                    {
                      Handle(WOKTools_StringValue) astrval = Handle(WOKTools_StringValue)::DownCast(avalue);
-                     VerboseMsg("WOK_TRIGGER") << "WOKTCL_TriggerHandler" << "Arg " << i << " is : " << astrval->Value() << endm;
+                     VerboseMsg()("WOK_TRIGGER") << "WOKTCL_TriggerHandler" << "Arg " << i << " is : " << astrval->Value() << endm;
                    }
                    break;
                  default:
@@ -101,7 +100,7 @@ Standard_EXPORT WOKUtils_TriggerStatus WOKTCL_TriggerHandler(WOKUtils_Trigger &a
            }
          
          WOK_TRACE {
-           VerboseMsg("WOK_TRIGGER") << "WOKTCL_TriggerHandler" 
+           VerboseMsg()("WOK_TRIGGER") << "WOKTCL_TriggerHandler" 
                                      << "Command is : " << acmd << endm;
          }
          if(CurrentInterp->Eval(acmd->ToCString()))
@@ -110,10 +109,10 @@ Standard_EXPORT WOKUtils_TriggerStatus WOKTCL_TriggerHandler(WOKUtils_Trigger &a
            {
              CurrentInterp->GetReturnValues(atrigger.ChangeReturn());
              WOK_TRACE {
-               if(VerboseMsg("WOK_TRIGGER").IsSet())
+               if(VerboseMsg()("WOK_TRIGGER").IsSet())
                  {
                    Standard_Integer i;
-                   VerboseMsg << "WOKTCL_TriggerHandler" 
+                   VerboseMsg() << "WOKTCL_TriggerHandler" 
                               << "Command returns : " << endm;
                    
                    const WOKTools_Return& rets = atrigger.Return();
@@ -122,7 +121,7 @@ Standard_EXPORT WOKUtils_TriggerStatus WOKTCL_TriggerHandler(WOKUtils_Trigger &a
                      {
                        Handle(WOKTools_ReturnValue) aval = rets.Value(i);
                        
-                       VerboseMsg << "WOKTCL_TriggerHandler" 
+                       VerboseMsg() << "WOKTCL_TriggerHandler" 
                                   << "             ";
                        
                        switch(aval->Type())
@@ -130,7 +129,7 @@ Standard_EXPORT WOKUtils_TriggerStatus WOKTCL_TriggerHandler(WOKUtils_Trigger &a
                          case WOKTools_String:
                            {
                              Handle(WOKTools_StringValue) astrval = Handle(WOKTools_StringValue)::DownCast(aval);
-                             VerboseMsg << "WOKTCL_TriggerHandler" 
+                             VerboseMsg() << "WOKTCL_TriggerHandler" 
                                         << "             " << i << " : " << astrval->Value() << endm;
                            }
                            break;
@@ -146,7 +145,7 @@ Standard_EXPORT WOKUtils_TriggerStatus WOKTCL_TriggerHandler(WOKUtils_Trigger &a
       else
        {
 #ifdef WOK_VERBOSE
-         VerboseMsg("WOK_TRIGGER") << "WOKTCL_TriggerHandler" 
+         VerboseMsg()("WOK_TRIGGER") << "WOKTCL_TriggerHandler" 
                                    << "Trigger : " << atrigger.Name() << " not setted" << endm;
 #endif
          return WOKUtils_NotSetted;
@@ -155,7 +154,7 @@ Standard_EXPORT WOKUtils_TriggerStatus WOKTCL_TriggerHandler(WOKUtils_Trigger &a
   else
     {
 #ifdef WOK_VERBOSE
-         VerboseMsg("WOK_TRIGGER") << "WOKTCL_TriggerHandler" 
+         VerboseMsg()("WOK_TRIGGER") << "WOKTCL_TriggerHandler" 
                                    << "No Trigger Name" << endm;
 #endif
          return WOKUtils_NotSetted;