Changeset 330e6f8 in tol for tol/btol/bgrammar/spfuninst.cpp

Timestamp:

Jan 18, 2011, 9:59:13 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

a6dac944

Parents:

d471a9f

Message:

Fixes #1056
Now libcint is dynamic loaded if posible.
Else, cint doesn't work but tol runs without problems

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

File:

• tol/btol/bgrammar/spfuninst.cpp (modified) (5 diffs)

tol/btol/bgrammar/spfuninst.cpp

@@ -51 +51 @@
 #include <tol/tol_bsymboltable.h>
 #include <tol/tol_bnameblock.h>
-#include <G__ci.h>
+#include <contrib/cint/tolCint.h>
+
 
 BTraceInit("spfuninst.cpp");
@@ -1650 +1651 @@
     BText ups = BParser::Unparse(tre, "  ");
   //Std(ups+"\n"); 
-    if(ups=="a::fun(?)::b") 
+    if(ups=="cD::C2B") 
       printf("");
   //Std(BText("\nEvMember branch1='")+BParser::Unparse(branch1,"  ")+"'\n"); 
@@ -1830 +1831 @@
       if(gra==GraReal())
       {
-        BDat cnt = G__double(G__calc(name));
+        BDat cnt = Cint_double(Cint_calc(name));
 /*
-        g = G__calc(name);
+        g = Cint_calc(name);
         bool ok = true;
         switch (g.type) 
@@ -1855 +1856 @@
         int rows = -1, columns = -1;
         double* buffer = NULL;
-        rows = G__int(G__calc(name+".rows_"));
-        columns = G__int(G__calc(name+".columns_"));
-        buffer = (double*)G__int(G__calc(BText("(int)(")+name+".buffer_)"));
+        rows = Cint_int(Cint_calc(name+".rows_"));
+        columns = Cint_int(Cint_calc(name+".columns_"));
+        buffer = (double*)Cint_int(Cint_calc(BText("(int)(")+name+".buffer_)"));
         if(rows>0 && columns>0 && buffer!=NULL)
         {
@@ -1868 +1869 @@
         int length = -1;
         char* buffer = NULL;
-        length = G__int(G__calc(name+".length_"));
-        buffer = (char*)G__int(G__calc(BText("(int)(")+name+".buffer_)"));
+        length = Cint_int(Cint_calc(name+".length_"));
+        buffer = (char*)Cint_int(Cint_calc(BText("(int)(")+name+".buffer_)"));
         if(length>0 && buffer!=NULL)
         {