Improve method of setting status_flags::dynallocated.

[ginac.git] / ginac / power.h

diff --git a/ginac/power.h b/ginac/power.h
index 26786ed094dd00421a5efb00e116a4d3ee6db05f..1662ee0382065dc4312adc7879de8957f775aaf8 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-2010 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 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
@@ -50,37 +50,37 @@ public:
        
        // functions overriding virtual functions from base classes
 public:
-       unsigned precedence() const {return 60;}
-       bool info(unsigned inf) const;
-       size_t nops() const;
-       ex op(size_t i) const;
-       ex map(map_function & f) const;
-       bool is_polynomial(const ex & var) const;
-       int degree(const ex & s) const;
-       int ldegree(const ex & s) const;
-       ex coeff(const ex & s, int n = 1) const;
-       ex eval(int level=0) const;
-       ex evalf(int level=0) const;
-       ex evalm() const;
-       ex series(const relational & s, int order, unsigned options = 0) const;
-       ex subs(const exmap & m, unsigned options = 0) const;
-       bool has(const ex & other, unsigned options = 0) const;
-       ex normal(exmap & repl, exmap & rev_lookup, int level = 0) const;
-       ex to_rational(exmap & repl) const;
-       ex to_polynomial(exmap & repl) const;
-       ex conjugate() const;
-       ex real_part() const;
-       ex imag_part() const;
+       unsigned precedence() const override {return 60;}
+       bool info(unsigned inf) const override;
+       size_t nops() const override;
+       ex op(size_t i) const override;
+       ex map(map_function & f) const override;
+       bool is_polynomial(const ex & var) const override;
+       int degree(const ex & s) const override;
+       int ldegree(const ex & s) const override;
+       ex coeff(const ex & s, int n = 1) const override;
+       ex eval(int level=0) const override;
+       ex evalf(int level=0) const override;
+       ex evalm() const override;
+       ex series(const relational & s, int order, unsigned options = 0) const override;
+       ex subs(const exmap & m, unsigned options = 0) const override;
+       bool has(const ex & other, unsigned options = 0) const override;
+       ex normal(exmap & repl, exmap & rev_lookup, int level = 0) const override;
+       ex to_rational(exmap & repl) const override;
+       ex to_polynomial(exmap & repl) const override;
+       ex conjugate() const override;
+       ex real_part() const override;
+       ex imag_part() const override;
        /** Save (a.k.a. serialize) object into archive. */
-       void archive(archive_node& n) const;
+       void archive(archive_node& n) const override;
        /** Read (a.k.a. deserialize) object from archive. */
-       void read_archive(const archive_node& n, lst& syms);
+       void read_archive(const archive_node& n, lst& syms) override;
 protected:
-       ex derivative(const symbol & s) const;
-       ex eval_ncmul(const exvector & v) const;
-       unsigned return_type() const;
-       return_type_t return_type_tinfo() const;
-       ex expand(unsigned options = 0) const;
+       ex derivative(const symbol & s) const override;
+       ex eval_ncmul(const exvector & v) const override;
+       unsigned return_type() const override;
+       return_type_t return_type_tinfo() const override;
+       ex expand(unsigned options = 0) const override;
        
        // new virtual functions which can be overridden by derived classes
        // none
@@ -95,9 +95,9 @@ protected:
        void do_print_python_repr(const print_python_repr & c, unsigned level) const;
        void do_print_csrc_cl_N(const print_csrc_cl_N & c, unsigned level) const;
 
-       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, bool from_expand = false) const;
+       static ex expand_add(const add & a, long n, unsigned options);
+       static ex expand_add_2(const add & a, unsigned options);
+       static ex expand_mul(const mul & m, const numeric & n, unsigned options, bool from_expand = false);
        
 // member variables
        
@@ -115,12 +115,12 @@ GINAC_DECLARE_UNARCHIVER(power);
  *  @param e the exponent expression */
 inline ex pow(const ex & b, const ex & e)
 {
-       return power(b, e);
+       return dynallocate<power>(b, e);
 }
 template<typename T1, typename T2>
 inline ex pow(const T1 & b, const T2 & e)
 {
-       return power(ex(b), ex(e));
+       return dynallocate<power>(ex(b), ex(e));
 }
 
 /** Square root expression.  Returns a power-object with exponent 1/2. */