- implemented object fusion as proposed by Richy

[ginac.git] / ginac / fderivative.h

diff --git a/ginac/fderivative.h b/ginac/fderivative.h
index 3b82ad39baf059da7deb6078aa662555b0cf120e..c165d314135d131693cc0196d9777c45e7d32022 100644 (file)
--- a/ginac/fderivative.h
+++ b/ginac/fderivative.h
@@ -60,17 +60,21 @@ public:
 
        // functions overriding virtual functions from base classes
 public:
-       void print(const print_context & c, unsigned level = 0) const;
        ex eval(int level = 0) const;
        ex evalf(int level = 0) const;
        ex series(const relational & r, int order, unsigned options = 0) const;
-       ex thisexprseq(const exvector & v) const;
-       ex thisexprseq(exvector * vp) const;
+       ex thiscontainer(const exvector & v) const;
+       ex thiscontainer(exvector * vp) const;
 protected:
        ex derivative(const symbol & s) const;
        bool is_equal_same_type(const basic & other) const;
        bool match_same_type(const basic & other) const;
 
+       // non-virtual functions in this class
+protected:
+       void do_print(const print_context & c, unsigned level) const;
+       void do_print_tree(const print_tree & c, unsigned level) const;
+
        // member variables
 protected:
        paramset parameter_set; /**< Set of parameter numbers with respect to which to take the derivative */