Changeset 7efc7be in tol

Timestamp:

Jun 8, 2012, 2:37:55 PM (14 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

78e136b

Parents:

352fe38

Message:

Fixes #1554
Disables all CINT features

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

Location:

tol

Files:

• contrib/cint/tolCint.cpp (modified) (1 diff)
• init.cpp (modified) (17 diffs)

tol/contrib/cint/tolCint.cpp

@@ -170 +170 @@
     return(-1); 
   } 
-  return((*G__init_cint_ptr)(command));
+  int res = (*G__init_cint_ptr)(command);
+  return(res);
 }
 

tol/init.cpp

@@ -67 +67 @@
 #include <gsl/gsl_errno.h>
 #include <tol/tol_bnameblock.h>
-#include <contrib/cint/tolCint.h>
 
 #include <time.h>
@@ -133 +132 @@
 //--------------------------------------------------------------------
 {
-  Cint_initialize(""); 
+//  Cint_initialize(""); 
 }
 
@@ -475 +474 @@
 {
   static BBool initGrammars_ = BFALSE;
-  TRACE_CINT_DECIMAL;
-
-  InitCint();
+
+//InitCint();
   if(initGrammars_)  { return(false); }
 
   signal_assign();
-  TRACE_CINT_DECIMAL;
 
   initGrammars_=BTRUE;
@@ -492 +489 @@
   TrcIGSL("LC_NUMERIC=C");
   setlocale( LC_NUMERIC, "C");
-  TRACE_CINT_DECIMAL;
 
   TrcIG("System tools: ");
@@ -499 +495 @@
   TrcIGS(BText("Small Block Heap=")<<sbh);
   _set_sbh_threshold(sbh);
-  TRACE_CINT_DECIMAL;
 # endif
 # if defined(__USE_GBLA__)
@@ -506 +501 @@
   TrcIGS("GBLA");
   if(!BLAPI_Init()) return false;
-  TRACE_CINT_DECIMAL;
   //------------------------------
 # endif
   TrcIGS("GSL");
   GslInitialize();
-  TRACE_CINT_DECIMAL;
   TrcIGS("Parser");
   BParser::InitDefaultParser();
-  TRACE_CINT_DECIMAL;
   TrcIGS("Global Hashed Table");
   BGrammar::Initialize();
-  TRACE_CINT_DECIMAL;
   TrcIGS("Local Stack Manager");
   BStackManager::Initialize();
-  TRACE_CINT_DECIMAL;
 
   TrcIG("System types: ");
@@ -527 +517 @@
   //--------------------------------------------------
   BAnyGrammar::InitGrammar();
-  TRACE_CINT_DECIMAL;
 
   //--------------------------------------------------
@@ -546 +535 @@
             BCopyContens<BDat>::New,
             BFunArgContens<BDat>::NewLocal);
-  TRACE_CINT_DECIMAL;
 
   //--------------------------------------------------
@@ -563 +551 @@
            BCopyContens<BText>::New,
            BFunArgContens<BText>::NewLocal);
-  TRACE_CINT_DECIMAL;
 
   //--------------------------------------------------
@@ -580 +567 @@
             BCopyContens<BDate>::New,
             BFunArgContens<BDate>::NewLocal);
-  TRACE_CINT_DECIMAL;
 
   //--------------------------------------------------
@@ -855 +841 @@
     TrcIGS("Special functions");
     BSpecialFunction::Initialize();
-  TRACE_CINT_DECIMAL;
 
     TrcIG("Built-in objects: ");
@@ -897 +882 @@
     TrcIGSL("AIA: Automatic Intervention Analisis");
         BAia::StaticInit();     
-  TRACE_CINT_DECIMAL;
     TrcIGSL("OIS: Objects Indexed Serialization");
     BOis::Initialize();
-  TRACE_CINT_DECIMAL;
     BGrammar::PutLast(GraSet());
 #   if defined(USE_DELAY_INIT)
@@ -909 +892 @@
     TrcIGS("Methods");
     BuildMethodFunctions();
-  TRACE_CINT_DECIMAL;
 
   //initializing tools 
@@ -923 +905 @@
         "SVN desde el que se ha generado la presente versión de TOL."));
 
-  Cint_initialize_tol_variables();
-
-  TRACE_CINT_DECIMAL;
+//Cint_initialize_tol_variables();
+
     int BTolOprProfiler_Init();
     BTolOprProfiler_Init();
-  TRACE_CINT_DECIMAL;
 
   _tolVersion_ = TOLVersion();
@@ -1269 +1249 @@
 //--------------------------------------------------------------------
 {
-  TRACE_CINT_DECIMAL;
   static bool done_ = false;
   if(done_) { return; }
   else      { done_ = true; }
-  TRACE_CINT_DECIMAL;
 
   BDir initTolPath = InitTolPath();
@@ -1285 +1263 @@
     }
   }
-  TRACE_CINT_DECIMAL;
 }
 
@@ -1497 +1474 @@
 //--------------------------------------------------------------------
 {
-  InitCint();
+//InitCint();
   if(lang>=0) { BText::PutLanguage(lang); }
   InitVerboseMode();