X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Fcontainer.pl;h=232d299c6fc12e0bb073ab5aa59c9a7923b1d694;hb=e5362a33f72613b324b3714524a8c2e5f7b7f46f;hp=f642e4114c33f13b217dd2340a0cf4193f4f9c28;hpb=7d10a252470cc6501b2c66bf9d6774c79b093761;p=ginac.git

diff --git a/ginac/container.pl b/ginac/container.pl
index f642e411..232d299c 100755
--- a/ginac/container.pl
+++ b/ginac/container.pl
@@ -155,7 +155,7 @@ $interface=<<END_OF_INTERFACE;
  *                        \$close_bracket=${close_bracket}
  *                        \$maxargs=${maxargs}
  *
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -187,22 +187,19 @@ $interface=<<END_OF_INTERFACE;
 namespace GiNaC {
 #endif // ndef NO_NAMESPACE_GINAC
 
-// typedef std::${STLHEADER}<ex> ${STLT};
-typedef std::${STLHEADER}<ex,malloc_alloc> ${STLT}; // CINT does not like ${STLHEADER}<...,default_alloc>
+
+// 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};
+#else
+typedef std::${STLHEADER}<ex> ${STLT};
+#endif
 
 class ${CONTAINER} : public basic
 {
 	GINAC_DECLARE_REGISTERED_CLASS(${CONTAINER}, basic)
 
-public:
-	${CONTAINER}();
-	~${CONTAINER}();
-	${CONTAINER}(${CONTAINER} const & other);
-	${CONTAINER} const & operator=(${CONTAINER} const & other);
-protected:
-	void copy(${CONTAINER} const & other);
-	void destroy(bool call_parent);
-
 public:
 	${CONTAINER}(${STLT} const & s, bool discardable=0);
 	${CONTAINER}(${STLT} * vp); // vp will be deleted
@@ -255,7 +252,7 @@ protected:
 // global constants
 
 extern const ${CONTAINER} some_${CONTAINER};
-extern const type_info & typeid_${CONTAINER};
+extern const std::type_info & typeid_${CONTAINER};
 
 // utility functions
 inline const ${CONTAINER} &ex_to_${CONTAINER}(const ex &e)
@@ -293,7 +290,7 @@ $implementation=<<END_OF_IMPLEMENTATION;
  *                        \$close_bracket=${close_bracket}
  *                        \$maxargs=${maxargs}
  *
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -337,28 +334,6 @@ ${CONTAINER}::${CONTAINER}() : basic(TINFO_${CONTAINER})
 	debugmsg("${CONTAINER} default constructor",LOGLEVEL_CONSTRUCT);
 }
 
-${CONTAINER}::~${CONTAINER}()
-{
-	debugmsg("${CONTAINER} destructor",LOGLEVEL_DESTRUCT);
-	destroy(false);
-}
-
-${CONTAINER}::${CONTAINER}(${CONTAINER} const & other)
-{
-	debugmsg("${CONTAINER} copy constructor",LOGLEVEL_CONSTRUCT);
-	copy(other);
-}
-
-${CONTAINER} const & ${CONTAINER}::operator=(${CONTAINER} const & other)
-{
-	debugmsg("${CONTAINER} operator=",LOGLEVEL_ASSIGNMENT);
-	if (this != &other) {
-		destroy(true);
-		copy(other);
-	}
-	return *this;
-}
-
 // protected
 
 void ${CONTAINER}::copy(${CONTAINER} const & other)
@@ -793,7 +768,7 @@ unsigned ${CONTAINER}::precedence=10;
 //////////
 
 const ${CONTAINER} some_${CONTAINER};
-const type_info & typeid_${CONTAINER}=typeid(some_${CONTAINER});
+const std::type_info & typeid_${CONTAINER} = typeid(some_${CONTAINER});
 
 #ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC