Remove dependence on depreacted std::auto_ptr<T>.

[ginac.git] / ginac / ncmul.h

diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index 9445d75044b26526adcdd805451ffb06bc37a5e4..8e68054a3dbc22a5aec134c37a186d3abc07f085 100644 (file)
--- a/ginac/ncmul.h
+++ b/ginac/ncmul.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's non-commutative products of expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 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
@@ -17,17 +17,16 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_NCMUL_H__
-#define __GINAC_NCMUL_H__
+#ifndef GINAC_NCMUL_H
+#define GINAC_NCMUL_H
 
 #include "exprseq.h"
+#include "archive.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 /** Non-commutative product of expressions. */
 class ncmul : public exprseq
@@ -35,21 +34,11 @@ class ncmul : public exprseq
        GINAC_DECLARE_REGISTERED_CLASS(ncmul, exprseq)
 
        friend class power;
-       friend ex nonsimplified_ncmul(const exvector & v);
-       friend ex simplified_ncmul(const exvector & v);
+       friend ex reeval_ncmul(const exvector & v);
+       friend ex hold_ncmul(const exvector & v);
 
 // member functions
 
-       // default constructor, destructor, copy constructor assignment operator and helpers
-public:
-       ncmul();
-       ~ncmul();
-       ncmul(const ncmul & other);
-       const ncmul & operator=(const ncmul & other);
-protected:
-       void copy(const ncmul & other);
-       void destroy(bool call_parent);
-
        // other constructors
 public:
        ncmul(const ex & lh, const ex & rh);
@@ -61,65 +50,50 @@ public:
        ncmul(const ex & f1, const ex & f2, const ex & f3,
              const ex & f4, const ex & f5, const ex & f6);
        ncmul(const exvector & v, bool discardable=false);
-       ncmul(exvector * vp); // vp will be deleted
+       ncmul(exvector && v);
 
-       // functions overriding virtual functions from bases classes
+       // functions overriding virtual functions from base classes
 public:
-       basic * duplicate() const;
-       void print(std::ostream & os, unsigned upper_precedence) const;
-       void printraw(std::ostream & os) const;
-       void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence = 0) const;
+       unsigned precedence() const {return 50;}
        bool info(unsigned inf) const;
-       int degree(const symbol & s) const;
-       int ldegree(const symbol & s) const;
+       int degree(const ex & s) const;
+       int ldegree(const ex & s) const;
        ex expand(unsigned options=0) const;
-       ex coeff(const symbol & s, int n=1) const;
+       ex coeff(const ex & s, int n=1) const;
        ex eval(int level=0) const;
-       ex subs(const lst & ls, const lst & lr) const;
-       exvector get_indices(void) const;
-       ex thisexprseq(const exvector & v) const;
-       ex thisexprseq(exvector * vp) const;
+       ex evalm() const;
+       exvector get_free_indices() const;
+       ex thiscontainer(const exvector & v) const;
+       ex thiscontainer(exvector && v) const;
+       ex conjugate() const;
+       ex real_part() const;
+       ex imag_part() const;
+
 protected:
        ex derivative(const symbol & s) const;
-       int compare_same_type(const basic & other) const;
-       unsigned return_type(void) const;
-       unsigned return_type_tinfo(void) const;
+       unsigned return_type() const;
+       return_type_t return_type_tinfo() const;
        
        // new virtual functions which can be overridden by derived classes
        // none
 
        // non-virtual functions in this class
 protected:
-       unsigned count_factors(const ex & e) const;
+       void do_print(const print_context & c, unsigned level) const;
+       void do_print_csrc(const print_context & c, unsigned level) const;
+       size_t count_factors(const ex & e) const;
        void append_factors(exvector & v, const ex & e) const;
        exvector expandchildren(unsigned options) const;
 public:
-       const exvector & get_factors(void) const;
-
-// member variables
-
-protected:
-       static unsigned precedence;
+       const exvector & get_factors() const;
 };
-
-// global constants
-
-extern const ncmul some_ncmul;
-extern const std::type_info & typeid_ncmul;
+GINAC_DECLARE_UNARCHIVER(ncmul);
 
 // friend funtions 
 
-ex nonsimplified_ncmul(const exvector & v);
-ex simplified_ncmul(const exvector & v);
-
-// utility functions
-inline const ncmul &ex_to_ncmul(const ex &e)
-{
-       return static_cast <const ncmul &>(*e.bp);
-}
+ex reeval_ncmul(const exvector & v);
+ex hold_ncmul(const exvector & v);
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
-#endif // ndef __GINAC_NCMUL_H__
+#endif // ndef GINAC_NCMUL_H