Univariate Hensel lifting now uses upoly.

[ginac.git] / ginac / mul.h

diff --git a/ginac/mul.h b/ginac/mul.h
index d9023c2f30755d2374e621d24f2f3a03864ecce8..bfcd886bbacd1b0d6443316ef91f507729f3b7ab 100644 (file)
--- a/ginac/mul.h
+++ b/ginac/mul.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's products of expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2006 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2008 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
@@ -41,8 +41,8 @@ public:
        mul(const ex & lh, const ex & rh);
        mul(const exvector & v);
        mul(const epvector & v);
-       mul(const epvector & v, const ex & oc);
-       mul(std::auto_ptr<epvector> vp, const ex & oc);
+       mul(const epvector & v, const ex & oc, bool do_index_renaming = false);
+       mul(std::auto_ptr<epvector> vp, const ex & oc, bool do_index_renaming = false);
        mul(const ex & lh, const ex & mh, const ex & rh);
        
        // functions overriding virtual functions from base classes
@@ -68,9 +68,9 @@ protected:
        ex derivative(const symbol & s) const;
        ex eval_ncmul(const exvector & v) const;
        unsigned return_type() const;
-       tinfo_t return_type_tinfo() const;
-       ex thisexpairseq(const epvector & v, const ex & oc) const;
-       ex thisexpairseq(std::auto_ptr<epvector> vp, const ex & oc) const;
+       return_type_t return_type_tinfo() const;
+       ex thisexpairseq(const epvector & v, const ex & oc, bool do_index_renaming = false) const;
+       ex thisexpairseq(std::auto_ptr<epvector> vp, const ex & oc, bool do_index_renaming = false) const;
        expair split_ex_to_pair(const ex & e) const;
        expair combine_ex_with_coeff_to_pair(const ex & e, const ex & c) const;
        expair combine_pair_with_coeff_to_pair(const expair & p, const ex & c) const;
@@ -98,6 +98,7 @@ protected:
        static bool can_be_further_expanded(const ex & e);
        std::auto_ptr<epvector> expandchildren(unsigned options) const;
 };
+GINAC_DECLARE_UNARCHIVER(mul);
 
 } // namespace GiNaC