OCC8311 Use tcl8.4 instead of current tcl8.3 cxx only

diff --git a/src/WOKTCL/WOKTCL_DefaultCommand.cxx b/src/WOKTCL/WOKTCL_DefaultCommand.cxx
index a2e2468520dad9f17a9cd8946a8828c6ea20da15..4fb5b643cc52395db2472a8f531938e78ba7c56a 100755 (executable)
--- a/src/WOKTCL/WOKTCL_DefaultCommand.cxx
+++ b/src/WOKTCL/WOKTCL_DefaultCommand.cxx
@@ -44,8 +44,14 @@
 //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 *, 
+                               Standard_Integer argc, const char* argv[])
+#else
 Standard_Integer DefaultCommand(ClientData clientData, Tcl_Interp *, 
                                Standard_Integer argc, char* argv[])
+#endif
 {
   volatile Standard_Integer status = 0;
 
@@ -68,7 +74,12 @@ Standard_Integer DefaultCommand(ClientData clientData, Tcl_Interp *,
     WOKUtils_ProcessManager::Arm();
 
     // appel de la fonction API
+    // MKV 24.08.05
+#if ((TCL_MAJOR_VERSION > 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))) && !defined(USE_NON_CONST)
+    if(!(*acmd)(C->i->Session(), argc, (char**)argv, returns))
+#else
     if(!(*acmd)(C->i->Session(), argc, argv, returns))
+#endif
       {
        if(!C->i->TreatReturn(returns)) 
          {
@@ -88,7 +99,12 @@ Standard_Integer DefaultCommand(ClientData clientData, Tcl_Interp *,
     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;
+#else
     ErrorMsg << argv[0] << "Exception was raised : " << GetSString(astream) << endm;
+#endif
 
     WOKAPI_Session* asess = (WOKAPI_Session *) &(C->i->Session());
     asess->GeneralFailure(E);

diff --git a/src/WOKTCL/WOKTCL_DefaultCommand.hxx b/src/WOKTCL/WOKTCL_DefaultCommand.hxx
index 1225a07144aa6824774c0977697c2a4495421f77..5ffc10f2dc1e772801188469cbf25e59aaf85dfc 100755 (executable)
--- a/src/WOKTCL/WOKTCL_DefaultCommand.hxx
+++ b/src/WOKTCL/WOKTCL_DefaultCommand.hxx
@@ -15,8 +15,14 @@ struct CData {
 };
 
 
+// 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 , Tcl_Interp *, 
+                               Standard_Integer ,const char* []);
+#else
 Standard_Integer DefaultCommand(ClientData , Tcl_Interp *, 
                                Standard_Integer , char* []);
+#endif
 
 void DefaultCommandDelete (ClientData );