- implemented global class registry (for class basic and derived classes)

[ginac.git] / ginac / power.h

diff --git a/ginac/power.h b/ginac/power.h
index 37ce802260c31dc1bc0ede5c806034cbbd10bc9c..4224c199085b0803898b87683a0b52ca742c7010 100644 (file)
--- a/ginac/power.h
+++ b/ginac/power.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's symbolic exponentiation (basis^exponent). */
 
 /*
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2000 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
@@ -26,6 +26,10 @@
 #include <ginac/basic.h>
 #include <ginac/ex.h>
 
+#ifndef NO_GINAC_NAMESPACE
+namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
+
 class numeric;
 class add;
 
@@ -33,6 +37,8 @@ class add;
  *  representing exponentiation. */
 class power : public basic
 {
+    GINAC_DECLARE_REGISTERED_CLASS(power, basic)
+
     friend class mul;
 
 // member functions
@@ -55,12 +61,12 @@ public:
     // 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 print(ostream & os, unsigned upper_precedence=0) const;
     void printcsrc(ostream & os, unsigned type, unsigned upper_precedence=0) const;
     bool info(unsigned inf) const;
-    int nops() const;
+    unsigned nops() const;
     ex & let_op(int const i);
     int degree(symbol const & s) const;
     int ldegree(symbol const & s) const;
@@ -103,7 +109,11 @@ protected:
 extern const power some_power;
 extern type_info const & typeid_power;
 
-#define ex_to_power(X) static_cast<power const &>(*(X).bp)
+// utility functions
+inline const power &ex_to_power(const ex &e)
+{
+       return static_cast<const power &>(*e.bp);
+}
 
 // wrapper functions
 
@@ -116,8 +126,10 @@ inline ex pow(ex const & b, ex const & e)
 
 /** Square root expression.  Returns a power-object with exponent 1/2 as a new
  *  expression.  */
-inline ex sqrt(ex const & a)
-{ return power(a,exHALF()); }
+ex sqrt(ex const & a);
 
-#endif // ndef __GINAC_POWER_H__
+#ifndef NO_GINAC_NAMESPACE
+} // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE
 
+#endif // ndef __GINAC_POWER_H__