fixes for gcc 3.4

diff --git a/check/exam_inifcns.cpp b/check/exam_inifcns.cpp
index a3a09650cd809f6020f820a0b7d99857b5c05382..c108ada8574c1f8387218c3169ed7607143215f0 100644 (file)
--- a/check/exam_inifcns.cpp
+++ b/check/exam_inifcns.cpp
@@ -26,6 +26,8 @@
 /* Assorted tests on other transcendental functions. */
 static unsigned inifcns_consist_trans()
 {
 /* Assorted tests on other transcendental functions. */
 static unsigned inifcns_consist_trans()
 {

+       using GiNaC::asin; using GiNaC::acos;
+

        unsigned result = 0;
        symbol x("x");
        ex chk;
        unsigned result = 0;
        symbol x("x");
        ex chk;


@@ -163,6 +165,8 @@ static unsigned inifcns_consist_gamma()
    arguments where the result exists in closed form and check if it's ok. */
 static unsigned inifcns_consist_psi()
 {
    arguments where the result exists in closed form and check if it's ok. */
 static unsigned inifcns_consist_psi()
 {

+       using GiNaC::log;
+

        unsigned result = 0;
        symbol x;
        ex e, f;
        unsigned result = 0;
        symbol x;
        ex e, f;

diff --git a/check/exam_pseries.cpp b/check/exam_pseries.cpp
index ab1ca0f6a72c6eb2c4e012f846d8a5c59bbfc041..8bd785a623ace37925cee58d1e8cda521d7ce9ae 100644 (file)
--- a/check/exam_pseries.cpp
+++ b/check/exam_pseries.cpp
@@ -41,6 +41,8 @@ static unsigned check_series(const ex &e, const ex &point, const ex &d, int orde
 // Series expansion
 static unsigned exam_series1()
 {
 // Series expansion
 static unsigned exam_series1()
 {

+       using GiNaC::log;
+

        unsigned result = 0;
        ex e, d;
        
        unsigned result = 0;
        ex e, d;
        


@@ -233,6 +235,8 @@ static unsigned exam_series9()
 // Series expansion of Li2((x==2)^2), caring about branch-cut
 static unsigned exam_series10()
 {
 // Series expansion of Li2((x==2)^2), caring about branch-cut
 static unsigned exam_series10()
 {

+       using GiNaC::log;
+

        ex e = Li2(pow(x,2));
        ex d = Li2(4) + (-log(3) + I*Pi*csgn(I-I*pow(x,2))) * (x-2)
               + (numeric(-2,3) + log(3)/4 - I*Pi/4*csgn(I-I*pow(x,2))) * pow(x-2,2)
        ex e = Li2(pow(x,2));
        ex d = Li2(4) + (-log(3) + I*Pi*csgn(I-I*pow(x,2))) * (x-2)
               + (numeric(-2,3) + log(3)/4 - I*Pi/4*csgn(I-I*pow(x,2))) * pow(x-2,2)


@@ -245,6 +249,8 @@ static unsigned exam_series10()
 // Series expansion of logarithms around branch points
 static unsigned exam_series11()
 {
 // Series expansion of logarithms around branch points
 static unsigned exam_series11()
 {

+       using GiNaC::log;
+

        unsigned result = 0;
        ex e, d;
        symbol a("a");
        unsigned result = 0;
        ex e, d;
        symbol a("a");


@@ -285,6 +291,8 @@ static unsigned exam_series11()
 // Series expansion of other functions around branch points
 static unsigned exam_series12()
 {
 // Series expansion of other functions around branch points
 static unsigned exam_series12()
 {

+       using GiNaC::log;
+

        unsigned result = 0;
        ex e, d;
        
        unsigned result = 0;
        ex e, d;
        

diff --git a/check/time_antipode.cpp b/check/time_antipode.cpp
index e88bd735cf4a54223bb528bc626a3856a6fc81c1..43d48f64d85c03b6ccdd0fff0f65c1da0c45f2d5 100644 (file)
--- a/check/time_antipode.cpp
+++ b/check/time_antipode.cpp
@@ -442,9 +442,9 @@ static const node tree6(unsigned cuts=0)
                        bool(cuts & 16)));
 }
 
                        bool(cuts & 16)));
 }
 

-static unsigned test_tree(const node (*tree_generator)(unsigned=0))
+static unsigned test_tree(const node tree_generator(unsigned))

 {
 {

-       const int edges = tree_generator().total_edges();
+       const int edges = tree_generator(0).total_edges();

        const int vertices = edges+1;
        
        // fill a vector of all possible 2^edges combinations of cuts...
        const int vertices = edges+1;
        
        // fill a vector of all possible 2^edges combinations of cuts...

diff --git a/ginac/basic.h b/ginac/basic.h
index a5af32366c6c8a063d0f939ec170357f17a88058..12109bf01dd9835783cf273267d26f523fee3b5f 100644 (file)
--- a/ginac/basic.h
+++ b/ginac/basic.h
@@ -242,35 +242,6 @@ inline bool is_exactly_a(const class basic &obj)
        return obj.tinfo() == T::reg_info.tinfo_key;
 }
 
        return obj.tinfo() == T::reg_info.tinfo_key;
 }
 

-/** Check if ex is a handle to a T, including base classes. */
-template <class T>
-inline bool is_a(const ex &obj)
-{
-       return is_a<T>(*obj.bp);
-}
-
-/** Check if ex is a handle to a T, not including base classes. */
-template <class T>
-inline bool is_exactly_a(const ex &obj)
-{
-       return is_exactly_a<T>(*obj.bp);
-}
-
-/** Return a reference to the basic-derived class T object embedded in an
- *  expression.  This is fast but unsafe: the result is undefined if the
- *  expression does not contain a T object at its top level.  Hence, you
- *  should generally check the type of e first.
- *
- *  @param e expression
- *  @return reference to pseries object
- *  @see is_exactly_a<class T>() */
-template <class T>
-inline const T &ex_to(const ex &e)
-{
-       GINAC_ASSERT(is_a<T>(e));
-       return static_cast<const T &>(*e.bp);
-}
-

 } // namespace GiNaC
 
 #endif // ndef __GINAC_BASIC_H__
 } // namespace GiNaC
 
 #endif // ndef __GINAC_BASIC_H__

diff --git a/ginac/container.h b/ginac/container.h
index f382a8ae66012652f3abe761474d108e1c38bb80..88ccd6a0adec63d4800abea17db8cd36d327d701 100644 (file)
--- a/ginac/container.h
+++ b/ginac/container.h
@@ -88,15 +88,15 @@ public:
        container(STLT const & s, bool discardable = false) : inherited(get_tinfo())
        {
                if (discardable)
        container(STLT const & s, bool discardable = false) : inherited(get_tinfo())
        {
                if (discardable)

-                       seq.swap(const_cast<STLT &>(s));
+                       this->seq.swap(const_cast<STLT &>(s));

                else
                else

-                       seq = s;
+                       this->seq = s;

        }
 
        explicit container(STLT * vp) : inherited(get_tinfo())
        {
                GINAC_ASSERT(vp);
        }
 
        explicit container(STLT * vp) : inherited(get_tinfo())
        {
                GINAC_ASSERT(vp);

-               seq.swap(*vp);
+               this->seq.swap(*vp);

                delete vp;
        }
 
                delete vp;
        }
 


@@ -108,68 +108,68 @@ public:
 
        container(const ex & p1, const ex & p2) : inherited(get_tinfo())
        {
 
        container(const ex & p1, const ex & p2) : inherited(get_tinfo())
        {

-               reserve(seq, 2);
-               seq.push_back(p1); seq.push_back(p2);
+               reserve(this->seq, 2);
+               this->seq.push_back(p1); this->seq.push_back(p2);

        }
 
        container(const ex & p1, const ex & p2, const ex & p3) : inherited(get_tinfo())
        {
        }
 
        container(const ex & p1, const ex & p2, const ex & p3) : inherited(get_tinfo())
        {

-               reserve(seq, 3);
-               seq.push_back(p1); seq.push_back(p2); seq.push_back(p3);
+               reserve(this->seq, 3);
+               this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);

        }
 
        container(const ex & p1, const ex & p2, const ex & p3,
                           const ex & p4) : inherited(get_tinfo())
        {
        }
 
        container(const ex & p1, const ex & p2, const ex & p3,
                           const ex & p4) : inherited(get_tinfo())
        {

-               reserve(seq, 4);
-               seq.push_back(p1); seq.push_back(p2); seq.push_back(p3);
-               seq.push_back(p4);
+               reserve(this->seq, 4);
+               this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
+               this->seq.push_back(p4);

        }
 
        container(const ex & p1, const ex & p2, const ex & p3,
                  const ex & p4, const ex & p5) : inherited(get_tinfo())
        {
        }
 
        container(const ex & p1, const ex & p2, const ex & p3,
                  const ex & p4, const ex & p5) : inherited(get_tinfo())
        {

-               reserve(seq, 5);
-               seq.push_back(p1); seq.push_back(p2); seq.push_back(p3);
-               seq.push_back(p4); seq.push_back(p5);
+               reserve(this->seq, 5);
+               this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
+               this->seq.push_back(p4); this->seq.push_back(p5);

        }
 
        container(const ex & p1, const ex & p2, const ex & p3,
                  const ex & p4, const ex & p5, const ex & p6) : inherited(get_tinfo())
        {
        }
 
        container(const ex & p1, const ex & p2, const ex & p3,
                  const ex & p4, const ex & p5, const ex & p6) : inherited(get_tinfo())
        {

-               reserve(seq, 6);
-               seq.push_back(p1); seq.push_back(p2); seq.push_back(p3);
-               seq.push_back(p4); seq.push_back(p5); seq.push_back(p6);
+               reserve(this->seq, 6);
+               this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
+               this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);

        }
 
        container(const ex & p1, const ex & p2, const ex & p3,
                  const ex & p4, const ex & p5, const ex & p6,
                  const ex & p7) : inherited(get_tinfo())
        {
        }
 
        container(const ex & p1, const ex & p2, const ex & p3,
                  const ex & p4, const ex & p5, const ex & p6,
                  const ex & p7) : inherited(get_tinfo())
        {

-               reserve(seq, 7);
-               seq.push_back(p1); seq.push_back(p2); seq.push_back(p3);
-               seq.push_back(p4); seq.push_back(p5); seq.push_back(p6);
-               seq.push_back(p7);
+               reserve(this->seq, 7);
+               this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
+               this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
+               this->seq.push_back(p7);

        }
 
        container(const ex & p1, const ex & p2, const ex & p3,
                  const ex & p4, const ex & p5, const ex & p6,
                  const ex & p7, const ex & p8) : inherited(get_tinfo())
        {
        }
 
        container(const ex & p1, const ex & p2, const ex & p3,
                  const ex & p4, const ex & p5, const ex & p6,
                  const ex & p7, const ex & p8) : inherited(get_tinfo())
        {

-               reserve(seq, 8);
-               seq.push_back(p1); seq.push_back(p2); seq.push_back(p3);
-               seq.push_back(p4); seq.push_back(p5); seq.push_back(p6);
-               seq.push_back(p7); seq.push_back(p8);
+               reserve(this->seq, 8);
+               this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
+               this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
+               this->seq.push_back(p7); this->seq.push_back(p8);

        }
 
        container(const ex & p1, const ex & p2, const ex & p3,
                  const ex & p4, const ex & p5, const ex & p6,
                  const ex & p7, const ex & p8, const ex & p9) : inherited(get_tinfo())
        {
        }
 
        container(const ex & p1, const ex & p2, const ex & p3,
                  const ex & p4, const ex & p5, const ex & p6,
                  const ex & p7, const ex & p8, const ex & p9) : inherited(get_tinfo())
        {

-               reserve(seq, 9);
-               seq.push_back(p1); seq.push_back(p2); seq.push_back(p3);
-               seq.push_back(p4); seq.push_back(p5); seq.push_back(p6);
-               seq.push_back(p7); seq.push_back(p8); seq.push_back(p9);
+               reserve(this->seq, 9);
+               this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
+               this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
+               this->seq.push_back(p7); this->seq.push_back(p8); this->seq.push_back(p9);

        }
 
        container(const ex & p1, const ex & p2, const ex & p3,
        }
 
        container(const ex & p1, const ex & p2, const ex & p3,


@@ -177,11 +177,11 @@ public:
                  const ex & p7, const ex & p8, const ex & p9,
                  const ex & p10) : inherited(get_tinfo())
        {
                  const ex & p7, const ex & p8, const ex & p9,
                  const ex & p10) : inherited(get_tinfo())
        {

-               reserve(seq, 10);
-               seq.push_back(p1); seq.push_back(p2); seq.push_back(p3);
-               seq.push_back(p4); seq.push_back(p5); seq.push_back(p6);
-               seq.push_back(p7); seq.push_back(p8); seq.push_back(p9);
-               seq.push_back(p10);
+               reserve(this->seq, 10);
+               this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
+               this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
+               this->seq.push_back(p7); this->seq.push_back(p8); this->seq.push_back(p9);
+               this->seq.push_back(p10);

        }
 
        container(const ex & p1, const ex & p2, const ex & p3,
        }
 
        container(const ex & p1, const ex & p2, const ex & p3,


@@ -189,11 +189,11 @@ public:
                  const ex & p7, const ex & p8, const ex & p9,
                  const ex & p10, const ex & p11) : inherited(get_tinfo())
        {
                  const ex & p7, const ex & p8, const ex & p9,
                  const ex & p10, const ex & p11) : inherited(get_tinfo())
        {

-               reserve(seq, 11);
-               seq.push_back(p1); seq.push_back(p2); seq.push_back(p3);
-               seq.push_back(p4); seq.push_back(p5); seq.push_back(p6);
-               seq.push_back(p7); seq.push_back(p8); seq.push_back(p9);
-               seq.push_back(p10); seq.push_back(p11);
+               reserve(this->seq, 11);
+               this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
+               this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
+               this->seq.push_back(p7); this->seq.push_back(p8); this->seq.push_back(p9);
+               this->seq.push_back(p10); this->seq.push_back(p11);

        }
 
        container(const ex & p1, const ex & p2, const ex & p3,
        }
 
        container(const ex & p1, const ex & p2, const ex & p3,


@@ -201,11 +201,11 @@ public:
                  const ex & p7, const ex & p8, const ex & p9,
                  const ex & p10, const ex & p11, const ex & p12) : inherited(get_tinfo())
        {
                  const ex & p7, const ex & p8, const ex & p9,
                  const ex & p10, const ex & p11, const ex & p12) : inherited(get_tinfo())
        {

-               reserve(seq, 12);
-               seq.push_back(p1); seq.push_back(p2); seq.push_back(p3);
-               seq.push_back(p4); seq.push_back(p5); seq.push_back(p6);
-               seq.push_back(p7); seq.push_back(p8); seq.push_back(p9);
-               seq.push_back(p10); seq.push_back(p11); seq.push_back(p12);
+               reserve(this->seq, 12);
+               this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
+               this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
+               this->seq.push_back(p7); this->seq.push_back(p8); this->seq.push_back(p9);
+               this->seq.push_back(p10); this->seq.push_back(p11); this->seq.push_back(p12);

        }
 
        container(const ex & p1, const ex & p2, const ex & p3,
        }
 
        container(const ex & p1, const ex & p2, const ex & p3,


@@ -214,12 +214,12 @@ public:
                  const ex & p10, const ex & p11, const ex & p12,
                  const ex & p13) : inherited(get_tinfo())
        {
                  const ex & p10, const ex & p11, const ex & p12,
                  const ex & p13) : inherited(get_tinfo())
        {

-               reserve(seq, 13);
-               seq.push_back(p1); seq.push_back(p2); seq.push_back(p3);
-               seq.push_back(p4); seq.push_back(p5); seq.push_back(p6);
-               seq.push_back(p7); seq.push_back(p8); seq.push_back(p9);
-               seq.push_back(p10); seq.push_back(p11); seq.push_back(p12);
-               seq.push_back(p13);
+               reserve(this->seq, 13);
+               this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
+               this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
+               this->seq.push_back(p7); this->seq.push_back(p8); this->seq.push_back(p9);
+               this->seq.push_back(p10); this->seq.push_back(p11); this->seq.push_back(p12);
+               this->seq.push_back(p13);

        }
 
        container(const ex & p1, const ex & p2, const ex & p3,
        }
 
        container(const ex & p1, const ex & p2, const ex & p3,


@@ -228,12 +228,12 @@ public:
                  const ex & p10, const ex & p11, const ex & p12,
                  const ex & p13, const ex & p14) : inherited(get_tinfo())
        {
                  const ex & p10, const ex & p11, const ex & p12,
                  const ex & p13, const ex & p14) : inherited(get_tinfo())
        {

-               reserve(seq, 14);
-               seq.push_back(p1); seq.push_back(p2); seq.push_back(p3);
-               seq.push_back(p4); seq.push_back(p5); seq.push_back(p6);
-               seq.push_back(p7); seq.push_back(p8); seq.push_back(p9);
-               seq.push_back(p10); seq.push_back(p11); seq.push_back(p12);
-               seq.push_back(p13); seq.push_back(p14);
+               reserve(this->seq, 14);
+               this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
+               this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
+               this->seq.push_back(p7); this->seq.push_back(p8); this->seq.push_back(p9);
+               this->seq.push_back(p10); this->seq.push_back(p11); this->seq.push_back(p12);
+               this->seq.push_back(p13); this->seq.push_back(p14);

        }
 
        container(const ex & p1, const ex & p2, const ex & p3,
        }
 
        container(const ex & p1, const ex & p2, const ex & p3,


@@ -242,12 +242,12 @@ public:
                  const ex & p10, const ex & p11, const ex & p12,
                  const ex & p13, const ex & p14, const ex & p15) : inherited(get_tinfo())
        {
                  const ex & p10, const ex & p11, const ex & p12,
                  const ex & p13, const ex & p14, const ex & p15) : inherited(get_tinfo())
        {

-               reserve(seq, 15);
-               seq.push_back(p1); seq.push_back(p2); seq.push_back(p3);
-               seq.push_back(p4); seq.push_back(p5); seq.push_back(p6);
-               seq.push_back(p7); seq.push_back(p8); seq.push_back(p9);
-               seq.push_back(p10); seq.push_back(p11); seq.push_back(p12);
-               seq.push_back(p13); seq.push_back(p14); seq.push_back(p15);
+               reserve(this->seq, 15);
+               this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
+               this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
+               this->seq.push_back(p7); this->seq.push_back(p8); this->seq.push_back(p9);
+               this->seq.push_back(p10); this->seq.push_back(p11); this->seq.push_back(p12);
+               this->seq.push_back(p13); this->seq.push_back(p14); this->seq.push_back(p15);

        }
 
        container(const ex & p1, const ex & p2, const ex & p3,
        }
 
        container(const ex & p1, const ex & p2, const ex & p3,


@@ -257,13 +257,13 @@ public:
                  const ex & p13, const ex & p14, const ex & p15,
                  const ex & p16) : inherited(get_tinfo())
        {
                  const ex & p13, const ex & p14, const ex & p15,
                  const ex & p16) : inherited(get_tinfo())
        {

-               reserve(seq, 16);
-               seq.push_back(p1); seq.push_back(p2); seq.push_back(p3);
-               seq.push_back(p4); seq.push_back(p5); seq.push_back(p6);
-               seq.push_back(p7); seq.push_back(p8); seq.push_back(p9);
-               seq.push_back(p10); seq.push_back(p11); seq.push_back(p12);
-               seq.push_back(p13); seq.push_back(p14); seq.push_back(p15);
-               seq.push_back(p16);
+               reserve(this->seq, 16);
+               this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
+               this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
+               this->seq.push_back(p7); this->seq.push_back(p8); this->seq.push_back(p9);
+               this->seq.push_back(p10); this->seq.push_back(p11); this->seq.push_back(p12);
+               this->seq.push_back(p13); this->seq.push_back(p14); this->seq.push_back(p15);
+               this->seq.push_back(p16);

        }
 
        // functions overriding virtual functions from base classes
        }
 
        // functions overriding virtual functions from base classes


@@ -271,7 +271,7 @@ public:
        void print(const print_context & c, unsigned level = 0) const;
        bool info(unsigned inf) const { return inherited::info(inf); }
        unsigned precedence() const { return 10; }
        void print(const print_context & c, unsigned level = 0) const;
        bool info(unsigned inf) const { return inherited::info(inf); }
        unsigned precedence() const { return 10; }

-       size_t nops() const { return seq.size(); }
+       size_t nops() const { return this->seq.size(); }

        ex op(size_t i) const;
        ex & let_op(size_t i);
        ex eval(int level = 0) const;
        ex op(size_t i) const;
        ex & let_op(size_t i);
        ex eval(int level = 0) const;


@@ -298,18 +298,18 @@ protected:
 private:
        void sort_(std::random_access_iterator_tag)
        {
 private:
        void sort_(std::random_access_iterator_tag)
        {

-               std::sort(seq.begin(), seq.end(), ex_is_less());
+               std::sort(this->seq.begin(), this->seq.end(), ex_is_less());

        }
 
        void sort_(std::input_iterator_tag)
        {
        }
 
        void sort_(std::input_iterator_tag)
        {

-               seq.sort(ex_is_less());
+               this->seq.sort(ex_is_less());

        }
 
        void unique_()
        {
        }
 
        void unique_()
        {

-               typename STLT::iterator p = std::unique(seq.begin(), seq.end(), ex_is_equal());
-               seq.erase(p, seq.end());
+               typename STLT::iterator p = std::unique(this->seq.begin(), this->seq.end(), ex_is_equal());
+               this->seq.erase(p, this->seq.end());

        }
 
 public:
        }
 
 public:


@@ -321,10 +321,10 @@ public:
        container & sort();
        container & unique();
 
        container & sort();
        container & unique();
 

-       const_iterator begin() const {return seq.begin();}
-       const_iterator end() const {return seq.end();}
-       const_reverse_iterator rbegin() const {return seq.rbegin();}
-       const_reverse_iterator rend() const {return seq.rend();}
+       const_iterator begin() const {return this->seq.begin();}
+       const_iterator end() const {return this->seq.end();}
+       const_reverse_iterator rbegin() const {return this->seq.rbegin();}
+       const_reverse_iterator rend() const {return this->seq.rend();}

 
 protected:
        STLT evalchildren(int level) const;
 
 protected:
        STLT evalchildren(int level) const;


@@ -342,7 +342,7 @@ container<C>::container(const archive_node &n, lst &sym_lst) : inherited(n, sym_
        for (unsigned int i=0; true; i++) {
                ex e;
                if (n.find_ex("seq", e, sym_lst, i))
        for (unsigned int i=0; true; i++) {
                ex e;
                if (n.find_ex("seq", e, sym_lst, i))

-                       seq.push_back(e);
+                       this->seq.push_back(e);

                else
                        break;
        }
                else
                        break;
        }


@@ -360,7 +360,7 @@ template <template <class> class C>
 void container<C>::archive(archive_node &n) const
 {
        inherited::archive(n);
 void container<C>::archive(archive_node &n) const
 {
        inherited::archive(n);

-       const_iterator i = seq.begin(), end = seq.end();
+       const_iterator i = this->seq.begin(), end = this->seq.end();

        while (i != end) {
                n.add_ex("seq", *i);
                ++i;
        while (i != end) {
                n.add_ex("seq", *i);
                ++i;


@@ -376,7 +376,7 @@ void container<C>::print(const print_context & c, unsigned level) const
                    << ", nops=" << nops()
                    << std::endl;
                unsigned delta_indent = static_cast<const print_tree &>(c).delta_indent;
                    << ", nops=" << nops()
                    << std::endl;
                unsigned delta_indent = static_cast<const print_tree &>(c).delta_indent;

-               const_iterator i = seq.begin(), end = seq.end();
+               const_iterator i = this->seq.begin(), end = this->seq.end();

                while (i != end) {
                        i->print(c, level + delta_indent);
                        ++i;
                while (i != end) {
                        i->print(c, level + delta_indent);
                        ++i;


@@ -398,7 +398,7 @@ ex container<C>::op(size_t i) const
 {
        GINAC_ASSERT(i < nops());
 
 {
        GINAC_ASSERT(i < nops());
 

-       const_iterator it = seq.begin();
+       const_iterator it = this->seq.begin();

        advance(it, i);
        return *it;
 }
        advance(it, i);
        return *it;
 }


@@ -409,7 +409,7 @@ ex & container<C>::let_op(size_t i)
        GINAC_ASSERT(i < nops());
 
        ensure_if_modifiable();
        GINAC_ASSERT(i < nops());
 
        ensure_if_modifiable();

-       typename STLT::iterator it = seq.begin();
+       typename STLT::iterator it = this->seq.begin();

        advance(it, i);
        return *it;
 }
        advance(it, i);
        return *it;
 }


@@ -440,7 +440,7 @@ int container<C>::compare_same_type(const basic & other) const
        GINAC_ASSERT(is_a<container>(other));
        const container & o = static_cast<const container &>(other);
 
        GINAC_ASSERT(is_a<container>(other));
        const container & o = static_cast<const container &>(other);
 

-       const_iterator it1 = seq.begin(), it1end = seq.end(),
+       const_iterator it1 = this->seq.begin(), it1end = this->seq.end(),

                       it2 = o.seq.begin(), it2end = o.seq.end();
 
        while (it1 != it1end && it2 != it2end) {
                       it2 = o.seq.begin(), it2end = o.seq.end();
 
        while (it1 != it1end && it2 != it2end) {


@@ -459,10 +459,10 @@ bool container<C>::is_equal_same_type(const basic & other) const
        GINAC_ASSERT(is_a<container>(other));
        const container & o = static_cast<const container &>(other);
 
        GINAC_ASSERT(is_a<container>(other));
        const container & o = static_cast<const container &>(other);
 

-       if (seq.size() != o.seq.size())
+       if (this->seq.size() != o.seq.size())

                return false;
 
                return false;
 

-       const_iterator it1 = seq.begin(), it1end = seq.end(), it2 = o.seq.begin();
+       const_iterator it1 = this->seq.begin(), it1end = this->seq.end(), it2 = o.seq.begin();

        while (it1 != it1end) {
                if (!it1->is_equal(*it2))
                        return false;
        while (it1 != it1end) {
                if (!it1->is_equal(*it2))
                        return false;


@@ -477,7 +477,7 @@ template <template <class> class C>
 container<C> & container<C>::prepend(const ex & b)
 {
        ensure_if_modifiable();
 container<C> & container<C>::prepend(const ex & b)
 {
        ensure_if_modifiable();

-       seq.push_front(b);
+       this->seq.push_front(b);

        return *this;
 }
 
        return *this;
 }
 


@@ -486,7 +486,7 @@ template <template <class> class C>
 container<C> & container<C>::append(const ex & b)
 {
        ensure_if_modifiable();
 container<C> & container<C>::append(const ex & b)
 {
        ensure_if_modifiable();

-       seq.push_back(b);
+       this->seq.push_back(b);

        return *this;
 }
 
        return *this;
 }
 


@@ -495,7 +495,7 @@ template <template <class> class C>
 container<C> & container<C>::remove_first()
 {
        ensure_if_modifiable();
 container<C> & container<C>::remove_first()
 {
        ensure_if_modifiable();

-       seq.pop_front();
+       this->seq.pop_front();

        return *this;
 }
 
        return *this;
 }
 


@@ -504,7 +504,7 @@ template <template <class> class C>
 container<C> & container<C>::remove_last()
 {
        ensure_if_modifiable();
 container<C> & container<C>::remove_last()
 {
        ensure_if_modifiable();

-       seq.pop_back();
+       this->seq.pop_back();

        return *this;
 }
 
        return *this;
 }
 


@@ -513,7 +513,7 @@ template <template <class> class C>
 container<C> & container<C>::remove_all()
 {
        ensure_if_modifiable();
 container<C> & container<C>::remove_all()
 {
        ensure_if_modifiable();

-       seq.clear();
+       this->seq.clear();

        return *this;
 }
 
        return *this;
 }
 


@@ -522,14 +522,14 @@ template <template <class> class C>
 container<C> & container<C>::sort()
 {
        ensure_if_modifiable();
 container<C> & container<C>::sort()
 {
        ensure_if_modifiable();

-       sort_(std::iterator_traits<typename STLT::iterator>::iterator_category());
+       sort_(typename std::iterator_traits<typename STLT::iterator>::iterator_category());

        return *this;
 }
 
 /** Specialization of container::unique_() for std::list. */
 inline void container<std::list>::unique_()
 {
        return *this;
 }
 
 /** Specialization of container::unique_() for std::list. */
 inline void container<std::list>::unique_()
 {

-       seq.unique(ex_is_equal());
+       this->seq.unique(ex_is_equal());

 }
 
 /** Remove adjacent duplicate elements. */
 }
 
 /** Remove adjacent duplicate elements. */


@@ -550,8 +550,8 @@ void container<C>::printseq(const print_context & c, char openbracket, char deli
        if (this_precedence <= upper_precedence)
                c.s << openbracket;
 
        if (this_precedence <= upper_precedence)
                c.s << openbracket;
 

-       if (!seq.empty()) {
-               const_iterator it = seq.begin(), itend = seq.end();
+       if (!this->seq.empty()) {
+               const_iterator it = this->seq.begin(), itend = this->seq.end();

                --itend;
                while (it != itend) {
                        it->print(c, this_precedence);
                --itend;
                while (it != itend) {
                        it->print(c, this_precedence);


@@ -569,15 +569,15 @@ template <template <class> 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)

-               return seq;
+               return this->seq;

        else if (level == -max_recursion_level)
                throw std::runtime_error("max recursion level reached");
 
        STLT s;
        else if (level == -max_recursion_level)
                throw std::runtime_error("max recursion level reached");
 
        STLT s;

-       reserve(s, seq.size());
+       reserve(s, this->seq.size());

 
        --level;
 
        --level;

-       const_iterator it = seq.begin(), itend = seq.end();
+       const_iterator it = this->seq.begin(), itend = this->seq.end();

        while (it != itend) {
                s.push_back(it->eval(level));
                ++it;
        while (it != itend) {
                s.push_back(it->eval(level));
                ++it;


@@ -593,14 +593,14 @@ typename container<C>::STLT *container<C>::subschildren(const exmap & m, unsigne
        // returns a pointer to a newly created epvector otherwise
        // (which has to be deleted somewhere else)
 
        // returns a pointer to a newly created epvector otherwise
        // (which has to be deleted somewhere else)
 

-       const_iterator cit = seq.begin(), end = seq.end();
+       const_iterator cit = this->seq.begin(), end = this->seq.end();

        while (cit != end) {
                const ex & subsed_ex = cit->subs(m, options);
                if (!are_ex_trivially_equal(*cit, subsed_ex)) {
 
                        // copy first part of seq which hasn't changed
        while (cit != end) {
                const ex & subsed_ex = cit->subs(m, options);
                if (!are_ex_trivially_equal(*cit, subsed_ex)) {
 
                        // copy first part of seq which hasn't changed

-                       STLT *s = new STLT(seq.begin(), cit);
-                       reserve(*s, seq.size());
+                       STLT *s = new STLT(this->seq.begin(), cit);
+                       reserve(*s, this->seq.size());

 
                        // insert changed element
                        s->push_back(subsed_ex);
 
                        // insert changed element
                        s->push_back(subsed_ex);

diff --git a/ginac/ex.h b/ginac/ex.h
index b9360416018296a349b967b2c1c130e24ec793f9..d16bdbc1998c5b31de414f232b42c8e675baa97a 100644 (file)
--- a/ginac/ex.h
+++ b/ginac/ex.h
@@ -555,6 +555,36 @@ inline ex ex::map(ex f(const ex &)) const
        return bp->map(fcn);
 }
 
        return bp->map(fcn);
 }
 

+// convenience type checker template functions
+
+/** Check if ex is a handle to a T, including base classes. */
+template <class T>
+inline bool is_a(const ex &obj)
+{
+       return is_a<T>(*obj.bp);
+}
+
+/** Check if ex is a handle to a T, not including base classes. */
+template <class T>
+inline bool is_exactly_a(const ex &obj)
+{
+       return is_exactly_a<T>(*obj.bp);
+}
+
+/** Return a reference to the basic-derived class T object embedded in an
+ *  expression.  This is fast but unsafe: the result is undefined if the
+ *  expression does not contain a T object at its top level.  Hence, you
+ *  should generally check the type of e first.
+ *
+ *  @param e expression
+ *  @return reference to object of class T
+ *  @see is_exactly_a<class T>() */
+template <class T>
+inline const T &ex_to(const ex &e)
+{
+       GINAC_ASSERT(is_a<T>(e));
+       return static_cast<const T &>(*e.bp);
+}

 
 } // namespace GiNaC
 
 
 } // namespace GiNaC
 

diff --git a/ginac/exprseq.cpp b/ginac/exprseq.cpp
index 9593b2c61103e99f4e7105560a408ec6ffb11c3f..828682f47f1672b05198f8c3cbb5e5a8768dc654 100644 (file)
--- a/ginac/exprseq.cpp
+++ b/ginac/exprseq.cpp
@@ -24,7 +24,7 @@
 
 namespace GiNaC {
 
 
 namespace GiNaC {
 

-GINAC_IMPLEMENT_REGISTERED_CLASS(exprseq, basic)
+template <> GINAC_IMPLEMENT_REGISTERED_CLASS(exprseq, basic)

 
 /** Specialization of container::info() for exprseq. */
 bool exprseq::info(unsigned inf) const
 
 /** Specialization of container::info() for exprseq. */
 bool exprseq::info(unsigned inf) const

diff --git a/ginac/function.pl b/ginac/function.pl
index 4d19e6295897a3ed19b7d70e103d39de13e9fe7a..5397d8db703679208b51875d0cabb5e5f80bf351 100755 (executable)
--- a/ginac/function.pl
+++ b/ginac/function.pl
@@ -990,12 +990,12 @@ std::vector<function_options> & function::registered_functions()
 
 bool function::lookup_remember_table(ex & result) const
 {
 
 bool function::lookup_remember_table(ex & result) const
 {

-       return remember_table::remember_tables()[serial].lookup_entry(*this,result);
+       return remember_table::remember_tables()[this->serial].lookup_entry(*this,result);

 }
 
 void function::store_remember_table(ex const & result) const
 {
 }
 
 void function::store_remember_table(ex const & result) const
 {

-       remember_table::remember_tables()[serial].add_entry(*this,result);
+       remember_table::remember_tables()[this->serial].add_entry(*this,result);

 }
 
 // public
 }
 
 // public

diff --git a/ginac/lst.cpp b/ginac/lst.cpp
index 566d16b172f9cc9081b84db060aee1113b2aaf88..97e793e4bde043e1dd533e54c379236aba4a7a04 100644 (file)
--- a/ginac/lst.cpp
+++ b/ginac/lst.cpp
@@ -24,7 +24,7 @@
 
 namespace GiNaC {
 
 
 namespace GiNaC {
 

-GINAC_IMPLEMENT_REGISTERED_CLASS(lst, basic)
+template <> GINAC_IMPLEMENT_REGISTERED_CLASS(lst, basic)

 
 /** Specialization of container::info() for lst. */
 bool lst::info(unsigned inf) const
 
 /** Specialization of container::info() for lst. */
 bool lst::info(unsigned inf) const