- Fixed "unterminated sed command".

[ginac.git] / ginac / constant.h

diff --git a/ginac/constant.h b/ginac/constant.h
index e70a211486c7e0f26b3cdb27a63e7355d517884d..4d456bd3754c596c5b3ed65f96e9fcd2a58d9f8a 100644 (file)
--- 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;
     
@@ -92,13 +92,12 @@ private:
 extern const constant some_constant;
 extern const type_info & typeid_constant;
 
-// extern const numeric I;
 extern const constant Pi;
 extern const constant Catalan;
-extern const constant EulerGamma;
+extern const constant Euler;
 
-#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__