- changed behaviour of numeric::is_rational() and added numeric::is_cinteger()

[ginac.git] / ginac / constant.h

diff --git a/ginac/constant.h b/ginac/constant.h
index e772ada848566a796b9e307f48748a6f2cdd5bb6..4d95d5700546ea1beb9a89443909e6da95e2a0e2 100644 (file)
--- a/ginac/constant.h
+++ b/ginac/constant.h
@@ -1,7 +1,8 @@
 /** @file constant.h
  *
- *  Interface to GiNaC's constant types and some special constants.
- *
+ *  Interface to GiNaC's constant types and some special constants. */
+
+/*
  *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -23,6 +24,11 @@
 #define __GINAC_CONSTANT_H__
 
 #include <string>
+#include <ginac/basic.h>
+
+#ifndef NO_GINAC_NAMESPACE
+namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
 
 /** This class holds constants, symbols with specific numerical value. Each
  *  object of this class must either provide their own function to evaluate it
@@ -35,6 +41,7 @@ class constant : public basic
 
     // default constructor, destructor, copy constructor assignment operator and helpers
 public:
+    constant();
     ~constant();
     constant(constant const & other);
     // constant const & operator=(constant const & other); /* it's pervert! */
@@ -71,7 +78,7 @@ private:
     string name;
     ex (*ef)();
     numeric * number;
-    bool fct_assigned;
+    // bool fct_assigned;
     unsigned serial;  //!< unique serial number for comparision
     static unsigned next_serial;
 };
@@ -86,4 +93,8 @@ extern const constant Pi;
 extern const constant Catalan;
 extern const constant EulerGamma;
 
+#ifndef NO_GINAC_NAMESPACE
+} // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE
+
 #endif // ndef __GINAC_CONSTANT_H__