Remove support for Cint.

diff --git a/doc/tutorial/ginac.texi b/doc/tutorial/ginac.texi
index 3db3518ee9a5cdf781b81d44e89e0624d9513eed..512209545ebaf85cd4ce394e4925eb430ee7989c 100644 (file)
--- a/doc/tutorial/ginac.texi
+++ b/doc/tutorial/ginac.texi
@@ -8434,14 +8434,9 @@ fix bugs in a traditional system.
 multiple interfaces: Though real GiNaC programs have to be written in
 some editor, then be compiled, linked and executed, there are more ways
 to work with the GiNaC engine.  Many people want to play with
 multiple interfaces: Though real GiNaC programs have to be written in
 some editor, then be compiled, linked and executed, there are more ways
 to work with the GiNaC engine.  Many people want to play with

-expressions interactively, as in traditional CASs.  Currently, two such
-windows into GiNaC have been implemented and many more are possible: the
-tiny @command{ginsh} that is part of the distribution exposes GiNaC's
-types to a command line and second, as a more consistent approach, an
-interactive interface to the Cint C++ interpreter has been put together
-(called GiNaC-cint) that allows an interactive scripting interface
-consistent with the C++ language.  It is available from the usual GiNaC
-FTP-site.
+expressions interactively, as in traditional CASs: The tiny
+@command{ginsh} that comes with the distribution exposes many, but not
+all, of GiNaC's types to a command line.

 
 @item
 seamless integration: it is somewhere between difficult and impossible
 
 @item
 seamless integration: it is somewhere between difficult and impossible

diff --git a/ginac/archive.cpp b/ginac/archive.cpp
index fc9ec2c4c64d042756d71350fd087900c0bd3a1e..ffd8b58a41a426cf08ffca449b493c78047dc516 100644 (file)
--- a/ginac/archive.cpp
+++ b/ginac/archive.cpp
@@ -673,13 +673,5 @@ void archive_node::printraw(std::ostream &os) const
        }
 }
 
        }
 }
 

-/** Create a dummy archive.  The intention is to fill archive_node's default
- *  ctor, which is currently a Cint-requirement. */
-archive* archive_node::dummy_ar_creator()
-{
-       static archive* some_ar = new archive;
-       return some_ar;
-}
-

 
 } // namespace GiNaC
 
 } // namespace GiNaC

diff --git a/ginac/archive.h b/ginac/archive.h
index a1feac9848344a3b02ff2222cbe1b4af86e7edd7..407581aea6b0d865724f0da630f022ee2a552f6b 100644 (file)
--- a/ginac/archive.h
+++ b/ginac/archive.h
@@ -83,7 +83,6 @@ public:
        };
        typedef std::vector<property>::const_iterator archive_node_cit;
 
        };
        typedef std::vector<property>::const_iterator archive_node_cit;
 

-       archive_node() : a(*dummy_ar_creator()), has_expression(false) {} // hack for cint which always requires a default constructor

        archive_node(archive &ar) : a(ar), has_expression(false) {}
        archive_node(archive &ar, const ex &expr);
 
        archive_node(archive &ar) : a(ar), has_expression(false) {}
        archive_node(archive &ar, const ex &expr);
 


@@ -143,8 +142,6 @@ public:
        void printraw(std::ostream &os) const;
 
 private:
        void printraw(std::ostream &os) const;
 
 private:

-       static archive* dummy_ar_creator();
-

        /** Reference to the archive to which this node belongs. */
        archive &a;
 
        /** Reference to the archive to which this node belongs. */
        archive &a;
 

diff --git a/ginac/ginac.h b/ginac/ginac.h
index f8545831fe3f98da9699cf45764ffba842cc211e..abc5018f949f33a59fbaba71efad1cc404783ab4 100644 (file)
--- a/ginac/ginac.h
+++ b/ginac/ginac.h
@@ -76,9 +76,4 @@
 #include "parser/parser.h"
 #endif
 
 #include "parser/parser.h"
 #endif
 

-#ifdef __MAKECINT__
-#pragma link C++ nestedclass;
-#pragma link C++ nestedtypedef;
-#endif
-

 #endif // ndef GINAC_H
 #endif // ndef GINAC_H

diff --git a/ginac/numeric.h b/ginac/numeric.h
index 0a6df50ad4cb4bb3e1ba842ec9a12c78270543f2..aa17d8010d8ac119e7877dc8e066e3c430d469ff 100644 (file)
--- a/ginac/numeric.h
+++ b/ginac/numeric.h
@@ -28,12 +28,6 @@
 #include "archive.h"
 
 #include <cln/complex.h>
 #include "archive.h"
 
 #include <cln/complex.h>

-#if defined(G__CINTVERSION) && !defined(__MAKECINT__)
-// Cint @$#$! doesn't like forward declaring classes used for casting operators
-// so we have to include the definition of cln::cl_N here, but it is enough to
-// do so for the compiler, hence the !defined(__MAKECINT__).
-  #include <cln/complex_class.h>
-#endif

 #include <stdexcept>
 #include <vector>
 
 #include <stdexcept>
 #include <vector>
 


@@ -333,9 +327,4 @@ ex CatalanEvalf();
 
 } // namespace GiNaC
 
 
 } // namespace GiNaC
 

-#ifdef __MAKECINT__
-#pragma link off defined_in cln/number.h;
-#pragma link off defined_in cln/complex_class.h;
-#endif
-

 #endif // ndef GINAC_NUMERIC_H
 #endif // ndef GINAC_NUMERIC_H