* Cint fix. It looks like the hacks are going to go away really soon,

  after some recent work by Masaharu.

diff --git a/ginac/archive.h b/ginac/archive.h
index 53204398838181607067b4c1e1937da53c9812b6..c8dc71c4675aba41271143696b2edd673392c3f1 100644 (file)
--- a/ginac/archive.h
+++ b/ginac/archive.h
@@ -74,9 +74,10 @@ public:
                std::string name;   /**< Name of property. */
                unsigned count;     /**< Number of occurrences. */
        };
-       // Cint doesn't like vector<..,default_alloc> but malloc_alloc is
-       // unstandardized and not supported by newer GCCs.
-#if defined(__GNUC__) && ((__GNUC__ == 2) && (__GNUC_MINOR__ < 97))
+       // Cint currently doesn't like vector<..,default_alloc> but malloc_alloc is
+       // unstandardized and not supported by newer GCCs.  This ugly hack will go
+       // away soon!
+#if (defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ < 97)) || (defined(G__GNUC) && (G__GNUC == 2) && (G__GNUC_MINOR < 97))
        typedef std::vector<property_info,malloc_alloc> propinfovector;
 #else
        typedef std::vector<property_info> propinfovector;

diff --git a/ginac/basic.h b/ginac/basic.h
index 375f25070776fd3525599701314bd138e629b233..9c54a67e45b2ed271a6ade82fa636dfc5d4e4fd9 100644 (file)
--- a/ginac/basic.h
+++ b/ginac/basic.h
@@ -45,10 +45,11 @@ class relational;
 class archive_node;
 class print_context;
 
-// Cint doesn't like vector<..,default_alloc> but malloc_alloc is
-// unstandardized and not supported by newer GCCs.
-#if defined(__GNUC__) && ((__GNUC__ == 2) && (__GNUC_MINOR__ < 97))
-  typedef std::vector<ex,malloc_alloc> exvector;
+// Cint currently doesn't like vector<..,default_alloc> but malloc_alloc is
+// unstandardized and not supported by newer GCCs.  This ugly hack will go
+// away soon!
+#if (defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ < 97)) || (defined(G__GNUC) && (G__GNUC == 2) && (G__GNUC_MINOR < 97))
+  typedef std::vector<GiNaC::ex,malloc_alloc> exvector;
 #else
   typedef std::vector<ex> exvector;
 #endif

diff --git a/ginac/container.pl b/ginac/container.pl
index 55da47c010df80d72077008d56c00623b6e909be..af9d5372ba4616cb441ed5c399a090c776fd490c 100755 (executable)
--- a/ginac/container.pl
+++ b/ginac/container.pl
@@ -186,10 +186,11 @@ $interface=<<END_OF_INTERFACE;
 namespace GiNaC {
 
 
-// Cint does not like ${STLHEADER}<..,default_alloc> but malloc_alloc is
-// unstandardized and not supported by newer GCCs.
-#if defined(__GNUC__) && ((__GNUC__ == 2) && (__GNUC_MINOR__ < 97))
-typedef std::${STLHEADER}<ex,malloc_alloc> ${STLT};
+// Cint currently does not like ${STLHEADER}<..,default_alloc> but malloc_alloc is
+// unstandardized and not supported by newer GCCs.  This ugly hack will go
+// away soon!
+#if (defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ < 97)) || (defined(G__GNUC) && (G__GNUC == 2) && (G__GNUC_MINOR < 97))
+typedef std::${STLHEADER}<GiNaC::ex,malloc_alloc> ${STLT};
 #else
 typedef std::${STLHEADER}<ex> ${STLT};
 #endif

diff --git a/ginac/pseries.cpp b/ginac/pseries.cpp
index f23bbdfdd940a08859258e4e26dc6cad6ef84906..ffb2cfb98125d658cbaeb1be9a2b13e60aeab34c 100644 (file)
--- a/ginac/pseries.cpp
+++ b/ginac/pseries.cpp
@@ -490,7 +490,7 @@ ex basic::series(const relational & r, int order, unsigned options) const
        const symbol &s = static_cast<symbol &>(*r.lhs().bp);
        
        if (!coeff.is_zero())
-               seq.push_back(expair(coeff, numeric(0)));
+               seq.push_back(expair(coeff, _ex0()));
        
        int n;
        for (n=1; n<order; ++n) {