From 0e22c5a63bb0f5792beba531d77944db18e3c191 Mon Sep 17 00:00:00 2001 From: Richard Kreckel Date: Sat, 31 Oct 2015 17:18:55 +0100 Subject: [PATCH 1/1] Remove support for Cint. --- doc/tutorial/ginac.texi | 11 +++-------- ginac/archive.cpp | 8 -------- ginac/archive.h | 3 --- ginac/ginac.h | 5 ----- ginac/numeric.h | 11 ----------- 5 files changed, 3 insertions(+), 35 deletions(-) diff --git a/doc/tutorial/ginac.texi b/doc/tutorial/ginac.texi index 3db3518e..51220954 100644 --- 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 -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 diff --git a/ginac/archive.cpp b/ginac/archive.cpp index fc9ec2c4..ffd8b58a 100644 --- 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 diff --git a/ginac/archive.h b/ginac/archive.h index a1feac98..407581ae 100644 --- a/ginac/archive.h +++ b/ginac/archive.h @@ -83,7 +83,6 @@ public: }; typedef std::vector::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); @@ -143,8 +142,6 @@ public: void printraw(std::ostream &os) const; private: - static archive* dummy_ar_creator(); - /** Reference to the archive to which this node belongs. */ archive &a; diff --git a/ginac/ginac.h b/ginac/ginac.h index f8545831..abc5018f 100644 --- a/ginac/ginac.h +++ b/ginac/ginac.h @@ -76,9 +76,4 @@ #include "parser/parser.h" #endif -#ifdef __MAKECINT__ -#pragma link C++ nestedclass; -#pragma link C++ nestedtypedef; -#endif - #endif // ndef GINAC_H diff --git a/ginac/numeric.h b/ginac/numeric.h index 0a6df50a..aa17d801 100644 --- a/ginac/numeric.h +++ b/ginac/numeric.h @@ -28,12 +28,6 @@ #include "archive.h" #include -#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 -#endif #include #include @@ -333,9 +327,4 @@ ex CatalanEvalf(); } // 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 -- 2.44.0