Compilation for GCC 4.2.

diff --git a/ginac/container.h b/ginac/container.h
index 7f9210027d9779c2974d794e9b0c6ee5c2779310..b173e35d476ca1fa3f4f9c01f8801e6f8a3bd654 100644 (file)
--- a/ginac/container.h
+++ b/ginac/container.h
@@ -39,7 +39,7 @@ namespace GiNaC {
 
 
 /** Helper template for encapsulating the reserve() mechanics of STL containers. */
 
 
 /** Helper template for encapsulating the reserve() mechanics of STL containers. */

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 class container_storage {
 protected:
        typedef C<ex> STLT;
 class container_storage {
 protected:
        typedef C<ex> STLT;


@@ -125,7 +125,7 @@ private:
 };
 
 /** Wrapper template for making GiNaC classes out of STL containers. */
 };
 
 /** Wrapper template for making GiNaC classes out of STL containers. */

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 class container : public basic, public container_storage<C> {
        GINAC_DECLARE_REGISTERED_CLASS(container, basic)
 
 class container : public basic, public container_storage<C> {
        GINAC_DECLARE_REGISTERED_CLASS(container, basic)
 


@@ -475,14 +475,14 @@ protected:
 };
 
 /** Default constructor */
 };
 
 /** Default constructor */

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 container<C>::container() : inherited(get_tinfo())
 {
        setflag(get_default_flags());
 }
 
 /** Construct object from archive_node. */
 container<C>::container() : inherited(get_tinfo())
 {
        setflag(get_default_flags());
 }
 
 /** Construct object from archive_node. */

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 container<C>::container(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
 {
        setflag(get_default_flags());
 container<C>::container(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
 {
        setflag(get_default_flags());


@@ -497,14 +497,14 @@ container<C>::container(const archive_node &n, lst &sym_lst) : inherited(n, sym_
 }
 
 /** Unarchive the object. */
 }
 
 /** Unarchive the object. */

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 ex container<C>::unarchive(const archive_node &n, lst &sym_lst)
 {
        return (new container(n, sym_lst))->setflag(status_flags::dynallocated);
 }
 
 /** Archive the object. */
 ex container<C>::unarchive(const archive_node &n, lst &sym_lst)
 {
        return (new container(n, sym_lst))->setflag(status_flags::dynallocated);
 }
 
 /** Archive the object. */

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 void container<C>::archive(archive_node &n) const
 {
        inherited::archive(n);
 void container<C>::archive(archive_node &n) const
 {
        inherited::archive(n);


@@ -515,14 +515,14 @@ void container<C>::archive(archive_node &n) const
        }
 }
 
        }
 }
 

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 void container<C>::do_print(const print_context & c, unsigned level) const
 {
        // always print brackets around seq, ignore upper_precedence
        printseq(c, get_open_delim(), ',', get_close_delim(), precedence(), precedence()+1);
 }
 
 void container<C>::do_print(const print_context & c, unsigned level) const
 {
        // always print brackets around seq, ignore upper_precedence
        printseq(c, get_open_delim(), ',', get_close_delim(), precedence(), precedence()+1);
 }
 

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 void container<C>::do_print_tree(const print_tree & c, unsigned level) const
 {
        c.s << std::string(level, ' ') << class_name() << " @" << this
 void container<C>::do_print_tree(const print_tree & c, unsigned level) const
 {
        c.s << std::string(level, ' ') << class_name() << " @" << this


@@ -537,20 +537,20 @@ void container<C>::do_print_tree(const print_tree & c, unsigned level) const
        c.s << std::string(level + c.delta_indent,' ') << "=====" << std::endl;
 }
 
        c.s << std::string(level + c.delta_indent,' ') << "=====" << std::endl;
 }
 

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 void container<C>::do_print_python(const print_python & c, unsigned level) const
 {
        printseq(c, '[', ',', ']', precedence(), precedence()+1);
 }
 
 void container<C>::do_print_python(const print_python & c, unsigned level) const
 {
        printseq(c, '[', ',', ']', precedence(), precedence()+1);
 }
 

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 void container<C>::do_print_python_repr(const print_python_repr & c, unsigned level) const
 {
        c.s << class_name();
        printseq(c, '(', ',', ')', precedence(), precedence()+1);
 }
 
 void container<C>::do_print_python_repr(const print_python_repr & c, unsigned level) const
 {
        c.s << class_name();
        printseq(c, '(', ',', ')', precedence(), precedence()+1);
 }
 

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 ex container<C>::op(size_t i) const
 {
        GINAC_ASSERT(i < nops());
 ex container<C>::op(size_t i) const
 {
        GINAC_ASSERT(i < nops());


@@ -560,7 +560,7 @@ ex container<C>::op(size_t i) const
        return *it;
 }
 
        return *it;
 }
 

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 ex & container<C>::let_op(size_t i)
 {
        GINAC_ASSERT(i < nops());
 ex & container<C>::let_op(size_t i)
 {
        GINAC_ASSERT(i < nops());


@@ -571,7 +571,7 @@ ex & container<C>::let_op(size_t i)
        return *it;
 }
 
        return *it;
 }
 

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 ex container<C>::eval(int level) const
 {
        if (level == 1)
 ex container<C>::eval(int level) const
 {
        if (level == 1)


@@ -580,7 +580,7 @@ ex container<C>::eval(int level) const
                return thiscontainer(evalchildren(level));
 }
 
                return thiscontainer(evalchildren(level));
 }
 

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 ex container<C>::subs(const exmap & m, unsigned options) const
 {
        std::auto_ptr<STLT> vp = subschildren(m, options);
 ex container<C>::subs(const exmap & m, unsigned options) const
 {
        std::auto_ptr<STLT> vp = subschildren(m, options);


@@ -591,7 +591,7 @@ ex container<C>::subs(const exmap & m, unsigned options) const
 }
 
 /** Compare two containers of the same type. */
 }
 
 /** Compare two containers of the same type. */

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 int container<C>::compare_same_type(const basic & other) const
 {
        GINAC_ASSERT(is_a<container>(other));
 int container<C>::compare_same_type(const basic & other) const
 {
        GINAC_ASSERT(is_a<container>(other));


@@ -610,7 +610,7 @@ int container<C>::compare_same_type(const basic & other) const
        return (it1 == it1end) ? (it2 == it2end ? 0 : -1) : 1;
 }
 
        return (it1 == it1end) ? (it2 == it2end ? 0 : -1) : 1;
 }
 

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 bool container<C>::is_equal_same_type(const basic & other) const
 {
        GINAC_ASSERT(is_a<container>(other));
 bool container<C>::is_equal_same_type(const basic & other) const
 {
        GINAC_ASSERT(is_a<container>(other));


@@ -630,7 +630,7 @@ bool container<C>::is_equal_same_type(const basic & other) const
 }
 
 /** Add element at front. */
 }
 
 /** Add element at front. */

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 container<C> & container<C>::prepend(const ex & b)
 {
        ensure_if_modifiable();
 container<C> & container<C>::prepend(const ex & b)
 {
        ensure_if_modifiable();


@@ -639,7 +639,7 @@ container<C> & container<C>::prepend(const ex & b)
 }
 
 /** Add element at back. */
 }
 
 /** Add element at back. */

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 container<C> & container<C>::append(const ex & b)
 {
        ensure_if_modifiable();
 container<C> & container<C>::append(const ex & b)
 {
        ensure_if_modifiable();


@@ -648,7 +648,7 @@ container<C> & container<C>::append(const ex & b)
 }
 
 /** Remove first element. */
 }
 
 /** Remove first element. */

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 container<C> & container<C>::remove_first()
 {
        ensure_if_modifiable();
 container<C> & container<C>::remove_first()
 {
        ensure_if_modifiable();


@@ -657,7 +657,7 @@ container<C> & container<C>::remove_first()
 }
 
 /** Remove last element. */
 }
 
 /** Remove last element. */

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 container<C> & container<C>::remove_last()
 {
        ensure_if_modifiable();
 container<C> & container<C>::remove_last()
 {
        ensure_if_modifiable();


@@ -666,7 +666,7 @@ container<C> & container<C>::remove_last()
 }
 
 /** Remove all elements. */
 }
 
 /** Remove all elements. */

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 container<C> & container<C>::remove_all()
 {
        ensure_if_modifiable();
 container<C> & container<C>::remove_all()
 {
        ensure_if_modifiable();


@@ -675,7 +675,7 @@ container<C> & container<C>::remove_all()
 }
 
 /** Sort elements. */
 }
 
 /** Sort elements. */

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 container<C> & container<C>::sort()
 {
        ensure_if_modifiable();
 container<C> & container<C>::sort()
 {
        ensure_if_modifiable();


@@ -690,7 +690,7 @@ template<> inline void container<std::list>::unique_()
 }
 
 /** Remove adjacent duplicate elements. */
 }
 
 /** Remove adjacent duplicate elements. */

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 container<C> & container<C>::unique()
 {
        ensure_if_modifiable();
 container<C> & container<C>::unique()
 {
        ensure_if_modifiable();


@@ -699,7 +699,7 @@ container<C> & container<C>::unique()
 }
 
 /** Print sequence of contained elements. */
 }
 
 /** Print sequence of contained elements. */

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 void container<C>::printseq(const print_context & c, char openbracket, char delim,
                             char closebracket, unsigned this_precedence,
                             unsigned upper_precedence) const
 void container<C>::printseq(const print_context & c, char openbracket, char delim,
                             char closebracket, unsigned this_precedence,
                             unsigned upper_precedence) const


@@ -722,7 +722,7 @@ void container<C>::printseq(const print_context & c, char openbracket, char deli
                c.s << closebracket;
 }
 
                c.s << closebracket;
 }
 

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 typename container<C>::STLT container<C>::evalchildren(int level) const
 {
        if (level == 1)
 typename container<C>::STLT container<C>::evalchildren(int level) const
 {
        if (level == 1)


@@ -743,7 +743,7 @@ typename container<C>::STLT container<C>::evalchildren(int level) const
        return s;
 }
 
        return s;
 }
 

-template <template <class> class C>
+template <template <class T, class = std::allocator<T> > class C>

 std::auto_ptr<typename container<C>::STLT> container<C>::subschildren(const exmap & m, unsigned options) const
 {
        // returns a NULL pointer if nothing had to be substituted
 std::auto_ptr<typename container<C>::STLT> container<C>::subschildren(const exmap & m, unsigned options) const
 {
        // returns a NULL pointer if nothing had to be substituted

diff --git a/ginac/registrar.h b/ginac/registrar.h
index e22cb2fb23c835c92089013625f90c88476c6543..bd4ddb03ad7375775494cc698e207c601a094fcd 100644 (file)
--- a/ginac/registrar.h
+++ b/ginac/registrar.h
@@ -35,7 +35,7 @@ namespace GiNaC {
 class ex;
 class archive_node;
 
 class ex;
 class archive_node;
 

-template <template <class> class> class container;
+template <template <class T, class = std::allocator<T> > class> class container;

 typedef container<std::list> lst;
 
 /** Definitions for the tinfo mechanism. */
 typedef container<std::list> lst;
 
 /** Definitions for the tinfo mechanism. */

diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy
index cdd5cb2a91b2c106aff3ea6139b5c496923e2c83..b252609edb01de28b0d0e04c07ba2bf72a82ef3f 100644 (file)
--- a/ginsh/ginsh_parser.yy
+++ b/ginsh/ginsh_parser.yy
@@ -715,7 +715,8 @@ static ex f_ginac_function(const exprseq &es, int serial)
 }
 
 // All registered GiNaC functions
 }
 
 // All registered GiNaC functions

-void GiNaC::ginsh_get_ginac_functions(void)
+namespace GiNaC {
+void ginsh_get_ginac_functions(void)

 {
        vector<function_options>::const_iterator i = function::registered_functions().begin(), end = function::registered_functions().end();
        unsigned serial = 0;
 {
        vector<function_options>::const_iterator i = function::registered_functions().begin(), end = function::registered_functions().end();
        unsigned serial = 0;


@@ -725,6 +726,7 @@ void GiNaC::ginsh_get_ginac_functions(void)
                serial++;
        }
 }
                serial++;
        }
 }

+}

 
 
 /*
 
 
 /*