* All your dependent bases are belong to us!

diff --git a/ginac/container.h b/ginac/container.h
index fb929f2fdf6f1dd1196720b46e3e4d336d0bc0c6..2459b364ffb0d36c70004f530cdc1cd147dd1751 100644 (file)
--- a/ginac/container.h
+++ b/ginac/container.h
@@ -354,7 +354,7 @@ public:
        container_init<ex, STLT> operator=(const ex & x)
        {
                this->seq.push_back(x);
        container_init<ex, STLT> operator=(const ex & x)
        {
                this->seq.push_back(x);

-               return container_init<ex, STLT>(seq);
+               return container_init<ex, STLT>(this->seq);

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

diff --git a/ginac/structure.h b/ginac/structure.h
index b929e88caceb61cc2bab30046d1664c77c711d29..dbe97d4226740060ef3a329a5b8913534ef2a117 100644 (file)
--- a/ginac/structure.h
+++ b/ginac/structure.h
@@ -26,6 +26,7 @@
 #include <functional>
 
 #include "ex.h"
 #include <functional>
 
 #include "ex.h"

+#include "operators.h"

 #include "print.h"
 
 namespace GiNaC {
 #include "print.h"
 
 namespace GiNaC {


@@ -132,7 +133,7 @@ public:
        ex evalf(int level = 0) const { return inherited::evalf(level); }
        ex evalm() const { return inherited::evalm(); }
 protected:
        ex evalf(int level = 0) const { return inherited::evalf(level); }
        ex evalm() const { return inherited::evalm(); }
 protected:

-       ex eval_ncmul(const exvector & v) const { return hold_ncmul(v); }
+       ex eval_ncmul(const exvector & v) const { return this->hold_ncmul(v); }

 public:
        ex eval_indexed(const basic & i) const { return i.hold(); }
 
 public:
        ex eval_indexed(const basic & i) const { return i.hold(); }