- Removed obsolete (even for Cint!) malloc_alloc template arguments.

diff --git a/ginac/archive.h b/ginac/archive.h
index c8dc71c4675aba41271143696b2edd673392c3f1..b2b403bb1ea8d950606cd7794a00c5cc08aa532b 100644 (file)
--- a/ginac/archive.h
+++ b/ginac/archive.h
@@ -74,14 +74,7 @@ public:
                std::string name;   /**< Name of property. */
                unsigned count;     /**< Number of occurrences. */
        };
-       // 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;
-#endif
 
        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) {}

diff --git a/ginac/basic.h b/ginac/basic.h
index 1b5f2cf3d5bdc391a4d0f08ff20746d159f18828..9199e34c5634f0101e147eaa1f597807cd08353b 100644 (file)
--- a/ginac/basic.h
+++ b/ginac/basic.h
@@ -45,14 +45,7 @@ class relational;
 class archive_node;
 class print_context;
 
-// 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
+typedef std::vector<ex> exvector;
 
 typedef ex (*map_func)(const ex & e);
 

diff --git a/ginac/container.pl b/ginac/container.pl
index 549f066e097cc99107c14a3139d691e22248ec88..93c5918294b25f6213445f2a1ea277d0875235df 100755 (executable)
--- a/ginac/container.pl
+++ b/ginac/container.pl
@@ -186,14 +186,7 @@ $interface=<<END_OF_INTERFACE;
 namespace GiNaC {
 
 
-// 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
 
 class ${CONTAINER} : public basic
 {