Changeset b6e5dacc in tol for toltcl/generic/tolaccess.cpp

Timestamp:

Feb 10, 2015, 9:48:20 PM (12 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

cc7ddc7

Parents:

950d323

Message:

refs #1812, refs #1818, compilación basada en CMake, eliminación de warnings, automatización de la regla install.

Configuración en Linux como:

cmake -DCMAKE_TOOLCHAIN_FILE=../linux-i686.toolchain.cmake -DTOL_PREFIX_PATH=/usr/local/tol32 -DCMAKE_BUILD_TYPE=Release -DTCL_LIBRARY=/usr/local/tcl8.5-i686/lib/libtcl8.5.so ..

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@6456 be4846ae-f051-483a-831f-b64e7d08527f

File:

• toltcl/generic/tolaccess.cpp (modified) (5 diffs)

toltcl/generic/tolaccess.cpp

@@ -745 +745 @@
     }
     objname = Tcl_GetString(items[1]);
+
     Tcl_UtfToExternalDString(NULL,objname,-1,&dstr);
     syn = gra->FINDVARIABLE(Tcl_DStringValue(&dstr));
@@ -1312 +1313 @@
   
   int datac;
-  Tcl_Obj ** datav = new ( Tcl_Obj* [ NUM_ARGS ] );
+  Tcl_Obj ** datav = new Tcl_Obj*[ NUM_ARGS ];
 
   // is ok to ask for a list
@@ -1656 +1657 @@
     tmp = I0.GetText();
     subitems[0] = Tcl_NewStringObj(tmp,-1);
-#if defined(_TOL_FROZEN_)
     value = (*serie)[I0];
-#else
-    value = (*serie)(I0);
-#endif
     if ( value.IsKnown() )
       subitems[1] = Tcl_NewDoubleObj(value.Value());
@@ -2547 +2544 @@
       printf("message: %s\n", ((BText&)str).Buffer());
       printf("objv[1] : %s\n", Tcl_GetString(objv[1]));
-      printf("%s\n", TT_interp->result);
+      printf("%s\n", Tcl_GetStringResult(TT_interp));
     }
     /* release the objects */
@@ -2602 +2599 @@
     if (status != TCL_OK) {
       printf("%s -- error in Tcl_EvalObjv:\n", CMD_SERIECHART);
-      printf("%s\n", TT_interp->result);
+      printf("%s\n", Tcl_GetStringResult(TT_interp));
       printf("objv[1] : %s\n", Tcl_GetString(objv[1]));
       printf("objv[2] : %s\n", Tcl_GetString(objv[2]));