X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fcontainer.pl;h=114da65289729c58ecbb314bec68d8246268d79d;hp=7f06cfebe3e947ecf614dcd62e59ff4d72dfb818;hb=6a07d58854e6dbc380e2204f6b154992c574d009;hpb=19c8f943c15dcc0d946fb4d5fef11e487d34857a diff --git a/ginac/container.pl b/ginac/container.pl index 7f06cfeb..114da652 100755 --- a/ginac/container.pl +++ b/ginac/container.pl @@ -125,11 +125,11 @@ sub generate { } $constructors_interface=generate( -' explicit ${CONTAINER}(${SEQ1});'."\n", +' explicit ${CONTAINER}(${SEQ1});'."\n", 'const ex & param${N}',', ','',''); $constructors_implementation=generate( - <<'END_OF_CONSTRUCTORS_IMPLEMENTATION','const ex & param${N}',', ',' seq.push_back(param${N});',"\n"); + <<'END_OF_CONSTRUCTORS_IMPLEMENTATION','const ex & param${N}',', ',' seq.push_back(param${N});',"\n"); ${CONTAINER}::${CONTAINER}(${SEQ1}) : basic(TINFO_${CONTAINER}) { debugmsg(\"${CONTAINER} constructor from ${N}*ex\",LOGLEVEL_CONSTRUCT); @@ -255,7 +255,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) @@ -340,7 +340,7 @@ ${CONTAINER}::${CONTAINER}() : basic(TINFO_${CONTAINER}) ${CONTAINER}::~${CONTAINER}() { debugmsg("${CONTAINER} destructor",LOGLEVEL_DESTRUCT); - destroy(0); + destroy(false); } ${CONTAINER}::${CONTAINER}(${CONTAINER} const & other) @@ -353,7 +353,7 @@ ${CONTAINER} const & ${CONTAINER}::operator=(${CONTAINER} const & other) { debugmsg("${CONTAINER} operator=",LOGLEVEL_ASSIGNMENT); if (this != &other) { - destroy(1); + destroy(true); copy(other); } return *this; @@ -793,7 +793,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