X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Fconstant.h;h=91ede2825ec395a59c131419c493915f90c791f0;hb=83c1a0ba18b918a02fea05272d6e9e514880b707;hp=e70a211486c7e0f26b3cdb27a63e7355d517884d;hpb=dbb36db8d02b2c25af6bbfff8135112637936e1f;p=ginac.git

diff --git a/ginac/constant.h b/ginac/constant.h
index e70a2114..91ede282 100644
--- a/ginac/constant.h
+++ b/ginac/constant.h
@@ -26,9 +26,9 @@
 #include <string>
 #include "basic.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 typedef ex (*evalffunctype)(void);
     
@@ -65,8 +65,8 @@ public:
     void printtree(ostream & os, unsigned indent) const;
     void printcsrc(ostream & os, unsigned type, unsigned upper_precedence=0) const;
     ex evalf(int level=0) const;
-    ex diff(const symbol & s) 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;
     
@@ -97,8 +97,8 @@ extern const constant Pi;
 extern const constant Catalan;
 extern const constant EulerGamma;
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_CONSTANT_H__