- Derivatives are now assembled in a slightly different manner (i.e. they

[ginac.git] / ginac / constant.h

diff --git a/ginac/constant.h b/ginac/constant.h
index 99cbe99928506d55abaa6c5d49ddf266f9692b8d..d099378fe92aee0fe20231d618358c76c208a6ec 100644 (file)
--- 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);
     
@@ -38,6 +38,7 @@ typedef ex (*evalffunctype)(void);
  *  number). */
 class constant : public basic
 {
+    GINAC_DECLARE_REGISTERED_CLASS(constant, basic)
 
 // member functions
 
@@ -45,29 +46,29 @@ 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 std::string & initname, evalffunctype efun=0);
+    constant(const std::string & initname, const numeric & initnumber);
 
     // functions overriding virtual functions from bases classes
 public:
     basic * duplicate() const;
-    void print(ostream & os, unsigned upper_precedence=0) const;
-    void printraw(ostream & os) const;
-    void printtree(ostream & os, unsigned indent) const;
-    void printcsrc(ostream & os, unsigned type, unsigned upper_precedence=0) const;
+    void print(std::ostream & os, unsigned upper_precedence=0) const;
+    void printraw(std::ostream & os) const;
+    void printtree(std::ostream & os, unsigned indent) const;
+    void printcsrc(std::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
@@ -78,7 +79,7 @@ protected:
 // member variables
 
 private:
-    string name;
+    std::string name;
     evalffunctype ef;
     numeric * number;
     // bool fct_assigned;
@@ -89,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__