X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fbasic.h;h=c54cc3816f49b67ab184b07ac9202d7948ea619d;hp=ebe10e68452182f8ee9dc15e85153a8868f7b706;hb=083b0f50275a536be807fa2a34c1e278098e12f5;hpb=956eeb82c513a723e864edefa857133282cf692b

diff --git a/ginac/basic.h b/ginac/basic.h
index ebe10e68..c54cc381 100644
--- a/ginac/basic.h
+++ b/ginac/basic.h
@@ -137,7 +137,6 @@ public: // only const functions please (may break reference counting)
     virtual ex collect(const symbol & s) const;
     virtual ex eval(int level=0) const;
     virtual ex evalf(int level=0) const;
-    virtual ex diff(const symbol & s) const;
     virtual ex series(const symbol & s, const ex & point, int order) const;
     virtual ex subs(const lst & ls, const lst & lr) const;
     virtual ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
@@ -147,6 +146,7 @@ public: // only const functions please (may break reference counting)
     virtual exvector get_indices(void) const;
     virtual ex simplify_ncmul(const exvector & v) const;
 protected: // non-const functions should be called from class ex only
+    virtual ex derivative(const symbol & s) const;
     virtual int compare_same_type(const basic & other) const;
     virtual bool is_equal_same_type(const basic & other) const;
     virtual unsigned return_type(void) const;
@@ -157,14 +157,15 @@ protected: // non-const functions should be called from class ex only
     // non-virtual functions in this class
 public:
     ex subs(const ex & e) const;
+    ex diff(const symbol & s, unsigned nth=1) const;
     int compare(const basic & other) const;
     bool is_equal(const basic & other) const;
     const basic & hold(void) const;
     unsigned gethash(void) const {if (flags & status_flags::hash_calculated) return hashvalue; else return calchash();}
     unsigned tinfo(void) const {return tinfo_key;}
-protected:
     const basic & setflag(unsigned f) const {flags |= f; return *this;}
     const basic & clearflag(unsigned f) const {flags &= ~f; return *this;}
+protected:
     void ensure_if_modifiable(void) const;
 
 // member variables