- Banned exZERO(), exONE(), exMINUSHALF() and all this from the interface.

[ginac.git] / ginac / power.h

diff --git a/ginac/power.h b/ginac/power.h
index a946a82f5311be8d368fced4227dd4e19fc75d2e..17c06c77b2f2920b9285e903a74a32f2f1d0c67e 100644 (file)
--- a/ginac/power.h
+++ b/ginac/power.h
@@ -1,7 +1,8 @@
 /** @file power.h
  *
- *  Interface to GiNaC's symbolic exponentiation (basis^exponent).
- *
+ *  Interface to GiNaC's symbolic exponentiation (basis^exponent). */
+
+/*
  *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -22,7 +23,13 @@
 #ifndef __GINAC_POWER_H__
 #define __GINAC_POWER_H__
 
-class power;
+#include <ginac/basic.h>
+#include <ginac/ex.h>
+
+#ifndef NO_GINAC_NAMESPACE
+namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
+
 class numeric;
 class add;
 
@@ -52,9 +59,9 @@ 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;
@@ -100,7 +107,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
 
@@ -113,8 +124,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__