documentation and grammar updates

[ginac.git] / ginac / basic.h

diff --git a/ginac/basic.h b/ginac/basic.h
index 9895902b5d85be488acf4c2a5a209254f81ca966..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
@@ -112,7 +113,7 @@ public: // only const functions please (may break reference counting)
        virtual int degree(const ex & s) const;
        virtual int ldegree(const ex & s) const;
        virtual ex coeff(const ex & s, int n = 1) const;
-       virtual ex collect(const ex & s) const;
+       virtual ex collect(const ex & s, bool distributed = false) const;
        virtual ex eval(int level = 0) const;
        virtual ex evalf(int level = 0) const;
        virtual ex series(const relational & r, int order, unsigned options = 0) const;