Speed up power::real_part() and power::imag_part().

[ginac.git] / ginac / mul.h

diff --git a/ginac/mul.h b/ginac/mul.h
index 168342de61233eb3d59de30c9fc1c403e2e0266c..fb3dd9cad1d4fe065eacfa107660fd1c834bd707 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-2007 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
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_MUL_H__
-#define __GINAC_MUL_H__
+#ifndef GINAC_MUL_H
+#define GINAC_MUL_H
 
 #include "expairseq.h"
 
@@ -42,13 +42,14 @@ public:
        mul(const exvector & v);
        mul(const epvector & v);
        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(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
 public:
        unsigned precedence() const {return 50;}
        bool info(unsigned inf) 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;
@@ -64,13 +65,14 @@ public:
        ex smod(const numeric &xi) const;
        numeric max_coefficient() const;
        exvector get_free_indices() const;
+       ex conjugate() const;
 protected:
        ex derivative(const symbol & s) const;
        ex eval_ncmul(const exvector & v) const;
        unsigned return_type() const;
-       tinfo_t return_type_tinfo() 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;
+       ex thisexpairseq(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;
@@ -96,9 +98,10 @@ protected:
        void do_print_csrc(const print_csrc & c, unsigned level) const;
        void do_print_python_repr(const print_python_repr & c, unsigned level) const;
        static bool can_be_further_expanded(const ex & e);
-       std::auto_ptr<epvector> expandchildren(unsigned options) const;
+       epvector expandchildren(unsigned options) const;
 };
+GINAC_DECLARE_UNARCHIVER(mul);
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_MUL_H__
+#endif // ndef GINAC_MUL_H