- 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 ef7e8c8d197a807c5f61928fa8a1c0d737831545..4d95d5700546ea1beb9a89443909e6da95e2a0e2 100644 (file)
--- a/ginac/constant.h
+++ b/ginac/constant.h
@@ -2,15 +2,33 @@
  *
  *  Interface to GiNaC's constant types and some special constants. */
 
  *
  *  Interface to GiNaC's constant types and some special constants. */
 

-#ifndef _CONSTANT_H_
-#define _CONSTANT_H_
+/*
+ *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */

 
 

-#include <string>
+#ifndef __GINAC_CONSTANT_H__
+#define __GINAC_CONSTANT_H__

 
 

-class constant;
+#include <string>
+#include <ginac/basic.h>

 
 

-#include "ex.h"
-#include "numeric.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
 
 /** This class holds constants, symbols with specific numerical value. Each
  *  object of this class must either provide their own function to evaluate it


@@ -23,6 +41,7 @@ class constant : public basic
 
     // default constructor, destructor, copy constructor assignment operator and helpers
 public:
 
     // 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! */
     ~constant();
     constant(constant const & other);
     // constant const & operator=(constant const & other); /* it's pervert! */


@@ -59,7 +78,7 @@ private:
     string name;
     ex (*ef)();
     numeric * number;
     string name;
     ex (*ef)();
     numeric * number;

-    bool fct_assigned;
+    // bool fct_assigned;

     unsigned serial;  //!< unique serial number for comparision
     static unsigned next_serial;
 };
     unsigned serial;  //!< unique serial number for comparision
     static unsigned next_serial;
 };


@@ -74,4 +93,8 @@ extern const constant Pi;
 extern const constant Catalan;
 extern const constant EulerGamma;
 
 extern const constant Catalan;
 extern const constant EulerGamma;
 

-#endif // ndef _CONSTANT_H_
+#ifndef NO_GINAC_NAMESPACE
+} // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE
+
+#endif // ndef __GINAC_CONSTANT_H__