Make .eval() evaluate top-level only.

[ginac.git] / ginac / fderivative.h

diff --git a/ginac/fderivative.h b/ginac/fderivative.h
index 0d74efc69fd16b7ad8c4ce8332f66c0abf1969aa..643fafafd48322f0b85e34e70c5a865691dab30d 100644 (file)
--- a/ginac/fderivative.h
+++ b/ginac/fderivative.h
@@ -3,7 +3,7 @@
  *  Interface to abstract derivatives of functions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -20,15 +20,14 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_FDERIVATIVE_H__
-#define __GINAC_FDERIVATIVE_H__
-
-#include <set>
+#ifndef GINAC_FDERIVATIVE_H
+#define GINAC_FDERIVATIVE_H
 
 #include "function.h"
 
-namespace GiNaC {
+#include <set>
 
+namespace GiNaC {
 
 typedef std::multiset<unsigned> paramset;
 
@@ -56,20 +55,22 @@ public:
        fderivative(unsigned ser, const paramset & params, const exvector & args);
 
        // internal constructors
-       fderivative(unsigned ser, const paramset & params, std::auto_ptr<exvector> vp);
+       fderivative(unsigned ser, const paramset & params, exvector && v);
 
        // 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 thiscontainer(const exvector & v) const;
-       ex thiscontainer(std::auto_ptr<exvector> vp) const;
+       void print(const print_context & c, unsigned level = 0) const override;
+       ex eval() const override;
+       ex evalf(int level = 0) const override;
+       ex series(const relational & r, int order, unsigned options = 0) const override;
+       ex thiscontainer(const exvector & v) const override;
+       ex thiscontainer(exvector && v) const override;
+       void archive(archive_node& n) const override;
+       void read_archive(const archive_node& n, lst& syms) override;
 protected:
-       ex derivative(const symbol & s) const;
-       bool is_equal_same_type(const basic & other) const;
-       bool match_same_type(const basic & other) const;
+       ex derivative(const symbol & s) const override;
+       bool is_equal_same_type(const basic & other) const override;
+       bool match_same_type(const basic & other) const override;
 
        // non-virtual functions in this class
 protected:
@@ -81,7 +82,8 @@ protected:
 protected:
        paramset parameter_set; /**< Set of parameter numbers with respect to which to take the derivative */
 };
+GINAC_DECLARE_UNARCHIVER(fderivative); 
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_DERIVATIVE_H__
+#endif // ndef GINAC_DERIVATIVE_H