* Friend declaration is no declaration 11.4/9.

[ginac.git] / ginac / power.h

diff --git a/ginac/power.h b/ginac/power.h
index ff547e308cbdf02d30aa06791b3847e065ba6d62..86ba6c91dbb94db8bd0c5fb93be0989e61fea5e7 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-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2005 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
@@ -30,6 +30,7 @@ namespace GiNaC {
 
 class numeric;
 class add;
+class mul;
 
 /** This class holds a two-component object, a basis and and exponent
  *  representing exponentiation. */
@@ -65,6 +66,7 @@ public:
        ex to_rational(exmap & repl) const;
        ex to_polynomial(exmap & repl) const;
        exvector get_free_indices() const;
+       ex conjugate() const;
 protected:
        ex derivative(const symbol & s) const;
        ex eval_ncmul(const exvector & v) const;
@@ -86,7 +88,7 @@ protected:
 
        ex expand_add(const add & a, int n, unsigned options) const;
        ex expand_add_2(const add & a, unsigned options) const;
-       ex expand_mul(const mul & m, const numeric & n, unsigned options) const;
+       ex expand_mul(const mul & m, const numeric & n, unsigned options, bool from_expand = false) const;
        
 // member variables