From: Richard Kreckel Date: Wed, 6 Jun 2001 22:16:02 +0000 (+0000) Subject: - Removed obsolete (even for Cint!) malloc_alloc template arguments. X-Git-Tag: release_0-9-0~11 X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=commitdiff_plain;h=31cb2d34d010ff711ad8e29787e295abdd497c75 - Removed obsolete (even for Cint!) malloc_alloc template arguments. --- diff --git a/ginac/archive.h b/ginac/archive.h index c8dc71c4..b2b403bb 100644 --- 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 propinfovector; -#else typedef std::vector 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 1b5f2cf3..9199e34c 100644 --- 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 exvector; -#else - typedef std::vector exvector; -#endif +typedef std::vector exvector; typedef ex (*map_func)(const ex & e); diff --git a/ginac/container.pl b/ginac/container.pl index 549f066e..93c59182 100755 --- a/ginac/container.pl +++ b/ginac/container.pl @@ -186,14 +186,7 @@ $interface=< 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} ${STLT}; -#else typedef std::${STLHEADER} ${STLT}; -#endif class ${CONTAINER} : public basic {