Changeset b6e5dacc in tol for toltcl/generic/tolsergrp.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/tolsergrp.cpp (modified) (3 diffs)

toltcl/generic/tolsergrp.cpp

@@ -1899 +1899 @@
     do {
       iter_cursor = cursors.data[iter];
-#if defined(_TOL_FROZEN_)
       dat = (*(iter_cursor->serie))[cur_date];
-#else
-      dat = (*(iter_cursor->serie))(cur_date);
-#endif
       if (dat.IsKnown())
         iter_cursor->append(idx_dating,dat.Value());
@@ -2137 +2133 @@
     do {
       iter_cursor = cursors.data[iter];
-#if defined(_TOL_FROZEN_)
       dat = (*(iter_cursor->serie))[cur_date];
-#else
-      dat = (*(iter_cursor->serie))(cur_date);
-#endif
       if (dat.IsKnown())
         iter_cursor->append(idx_dating,dat.Value());
@@ -2266 +2258 @@
   uts->ReadData();
   for ( i = 0; i < size_t(length); i++ ) {
-#if defined(_TOL_FROZEN_)
     serdata(i) = (*uts)[I0];
-#else
-    serdata(i) = (*uts)(I0); 
-#endif
     I0 += tms;
   }