* Fix some language conformance issues needed for GCC 4.0

  (c.f. Debian Bug#298400).

diff --git a/check/exam_structure.cpp b/check/exam_structure.cpp
index 8d80a7b12e2c4027ad18f7553af64ddb5c2da01e..fa83e418af68b7de69a7655e63b1568dff07c09f 100644 (file)
--- a/check/exam_structure.cpp
+++ b/check/exam_structure.cpp
@@ -47,13 +47,13 @@ inline ex make_sprod(const ex & l, const ex & r)
        return sprod(sprod_s(l, r));
 }
 
        return sprod(sprod_s(l, r));
 }
 

-void sprod::print(const print_context & c, unsigned level) const
+template <> void sprod::print(const print_context & c, unsigned level) const

 {
        const sprod_s & sp = get_struct();
        c.s << "<" << sp.left << "|" << sp.right << ">";
 }
 
 {
        const sprod_s & sp = get_struct();
        c.s << "<" << sp.left << "|" << sp.right << ">";
 }
 

-ex sprod::eval(int level) const
+template <> ex sprod::eval(int level) const

 {
        // symmetric scalar product
        const sprod_s & sp = get_struct();
 {
        // symmetric scalar product
        const sprod_s & sp = get_struct();

diff --git a/ginac/exprseq.cpp b/ginac/exprseq.cpp
index 709e543de46b637aba615f371e0c3a2d1e3a4b6a..2024f3d1946ef59b5eab785b5d52dd92a3c4862f 100644 (file)
--- a/ginac/exprseq.cpp
+++ b/ginac/exprseq.cpp
@@ -29,7 +29,7 @@ template <> GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(exprseq, basic,
   print_func<print_tree>(&exprseq::do_print_tree))
 
 /** Specialization of container::info() for exprseq. */
   print_func<print_tree>(&exprseq::do_print_tree))
 
 /** Specialization of container::info() for exprseq. */

-bool exprseq::info(unsigned inf) const
+template <> bool exprseq::info(unsigned inf) const

 {
        if (inf == info_flags::exprseq)
                return true;
 {
        if (inf == info_flags::exprseq)
                return true;

diff --git a/ginac/inifcns.h b/ginac/inifcns.h
index 9a15bc6777e3cda93b71bfc13a1ef21a9936b3d3..3230abacc0728da5280d0d2f827f2d44cf3f6634 100644 (file)
--- a/ginac/inifcns.h
+++ b/ginac/inifcns.h
@@ -108,7 +108,7 @@ inline function zeta(const T1& p1, const T2& p2) {
        return function(zeta2_SERIAL::serial, ex(p1), ex(p2));
 }
 class zeta_SERIAL;
        return function(zeta2_SERIAL::serial, ex(p1), ex(p2));
 }
 class zeta_SERIAL;

-template<> inline bool is_the_function<class zeta_SERIAL>(const ex& x)
+template<> inline bool is_the_function<zeta_SERIAL>(const ex& x)

 {
        return is_the_function<zeta1_SERIAL>(x) || is_the_function<zeta2_SERIAL>(x);
 }
 {
        return is_the_function<zeta1_SERIAL>(x) || is_the_function<zeta2_SERIAL>(x);
 }


@@ -127,7 +127,7 @@ inline function G(const T1& x, const T2& s, const T3& y) {
        return function(G3_SERIAL::serial, ex(x), ex(s), ex(y));
 }
 class G_SERIAL;
        return function(G3_SERIAL::serial, ex(x), ex(s), ex(y));
 }
 class G_SERIAL;

-template<> inline bool is_the_function<class G_SERIAL>(const ex& x)
+template<> inline bool is_the_function<G_SERIAL>(const ex& x)

 {
        return is_the_function<G2_SERIAL>(x) || is_the_function<G3_SERIAL>(x);
 }
 {
        return is_the_function<G2_SERIAL>(x) || is_the_function<G3_SERIAL>(x);
 }


@@ -162,7 +162,7 @@ inline function psi(const T1 & p1, const T2 & p2) {
        return function(psi2_SERIAL::serial, ex(p1), ex(p2));
 }
 class psi_SERIAL;
        return function(psi2_SERIAL::serial, ex(p1), ex(p2));
 }
 class psi_SERIAL;

-template<> inline bool is_the_function<class psi_SERIAL>(const ex & x)
+template<> inline bool is_the_function<psi_SERIAL>(const ex & x)

 {
        return is_the_function<psi1_SERIAL>(x) || is_the_function<psi2_SERIAL>(x);
 }
 {
        return is_the_function<psi1_SERIAL>(x) || is_the_function<psi2_SERIAL>(x);
 }

diff --git a/ginac/lst.cpp b/ginac/lst.cpp
index 1c33cd6d6db5532692a2186dec65752b9691153d..0621ce68fd644e43cf4dd625c128d97c8dfa35d4 100644 (file)
--- a/ginac/lst.cpp
+++ b/ginac/lst.cpp
@@ -29,7 +29,7 @@ template <> GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(lst, basic,
   print_func<print_tree>(&lst::do_print_tree))
 
 /** Specialization of container::info() for lst. */
   print_func<print_tree>(&lst::do_print_tree))
 
 /** Specialization of container::info() for lst. */

-bool lst::info(unsigned inf) const
+template <> bool lst::info(unsigned inf) const

 {
        if (inf == info_flags::list)
                return true;
 {
        if (inf == info_flags::list)
                return true;

diff --git a/ginac/structure.h b/ginac/structure.h
index 1932c0f357c293c8a1ae1331be237eaba0ac61d2..22e684008fd5395fc5e191d47efd6518c6782e88 100644 (file)
--- a/ginac/structure.h
+++ b/ginac/structure.h
@@ -27,6 +27,7 @@
 
 #include "ex.h"
 #include "ncmul.h"
 
 #include "ex.h"
 #include "ncmul.h"

+#include "numeric.h"

 #include "operators.h"
 #include "print.h"
 
 #include "operators.h"
 #include "print.h"