container.pl: can now generate constructors for an arbitary number

[ginac.git] / ginac / add.h

diff --git a/ginac/add.h b/ginac/add.h
index 51cb4f104eba044a8c2f5bc458a56c5946792961..4e5ec2bbe014e3c2ba21c9dce799855985125de2 100644 (file)
--- a/ginac/add.h
+++ b/ginac/add.h
@@ -23,11 +23,11 @@
 #ifndef __GINAC_ADD_H__
 #define __GINAC_ADD_H__
 
-#include <ginac/expairseq.h>
+#include "expairseq.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 /** Sum of expressions. */
 class add : public expairseq
@@ -70,7 +70,6 @@ public:
     int ldegree(const symbol & s) const;
     ex coeff(const symbol & s, int n=1) const;
     ex eval(int level=0) const;
-    ex diff(const symbol & s) const;
     ex series(const symbol & s, const ex & point, int order) const;
     ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
     numeric integer_content(void) const;
@@ -79,6 +78,7 @@ public:
     exvector get_indices(void) const;
     ex simplify_ncmul(const exvector & v) const;
 protected:
+    ex derivative(const symbol & s) const;
     int compare_same_type(const basic & other) const;
     bool is_equal_same_type(const basic & other) const;
     unsigned return_type(void) const;
@@ -116,8 +116,8 @@ inline const add &ex_to_add(const ex &e)
        return static_cast<const add &>(*e.bp);
 }
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_ADD_H__