X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fconstant.h;h=4d456bd3754c596c5b3ed65f96e9fcd2a58d9f8a;hb=95f3dcd0705c227dd2be3cf8b340afc14c186d5a;hp=2e6ad5b0eb8d851ab033e5633ce32160ec020435;hpb=0a1b35cf1e59c9e3aae33de8febaa1c8f4bbe630;p=ginac.git

diff --git a/ginac/constant.h b/ginac/constant.h
index 2e6ad5b0..4d456bd3 100644
--- a/ginac/constant.h
+++ b/ginac/constant.h
@@ -24,11 +24,11 @@
 #define __GINAC_CONSTANT_H__
 
 #include <string>
-#include <ginac/basic.h>
+#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);
     
@@ -46,16 +46,16 @@ class constant : public basic
 public:
     constant();
     ~constant();
-    constant(constant const & other);
-    // constant const & operator=(constant const & other); /* it's pervert! */
+    constant(const constant & other);
+    // const constant & operator=(const constant & other); /* it's pervert! */
 protected:
-    void copy(constant const & other);
+    void copy(const constant & other);
     void destroy(bool call_parent);
 
     // other constructors
 public:
-    constant(string const & initname, evalffunctype efun=0);
-    constant(string const & initname, numeric const & initnumber);
+    constant(const string & initname, evalffunctype efun=0);
+    constant(const string & initname, const numeric & initnumber);
 
     // functions overriding virtual functions from bases classes
 public:
@@ -65,10 +65,10 @@ 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(symbol const & s) const;
 protected:
-    int compare_same_type(basic const & other) const;
-    bool is_equal_same_type(basic const & other) const;
+    ex derivative(const symbol & s) const;
+    int compare_same_type(const basic & other) const;
+    bool is_equal_same_type(const basic & other) const;
     
     // new virtual functions which can be overridden by derived classes
     // none
@@ -90,15 +90,14 @@ private:
 // global constants
 
 extern const constant some_constant;
-extern type_info const & typeid_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__