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

[ginac.git] / ginac / ncmul.h

diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index 46a7aae1bd101da1f86cab802e0bb4d4bb6a9364..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-2004 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,13 +17,14 @@
  *
  *  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"
 
 namespace GiNaC {
 
@@ -49,7 +50,7 @@ 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(std::auto_ptr<exvector> vp);
+       ncmul(exvector && v);
 
        // functions overriding virtual functions from base classes
 public:
@@ -63,13 +64,15 @@ public:
        ex evalm() const;
        exvector get_free_indices() const;
        ex thiscontainer(const exvector & v) const;
-       ex thiscontainer(std::auto_ptr<exvector> vp) const;
+       ex thiscontainer(exvector && v) const;
        ex conjugate() const;
+       ex real_part() const;
+       ex imag_part() const;
 
 protected:
        ex derivative(const symbol & s) const;
        unsigned return_type() const;
-       unsigned return_type_tinfo() const;
+       return_type_t return_type_tinfo() const;
        
        // new virtual functions which can be overridden by derived classes
        // none
@@ -84,20 +87,13 @@ protected:
 public:
        const exvector & get_factors() const;
 };
+GINAC_DECLARE_UNARCHIVER(ncmul);
 
 // friend funtions 
 
 ex reeval_ncmul(const exvector & v);
 ex hold_ncmul(const exvector & v);
 
-// utility functions
-
-/** Specialization of is_exactly_a<ncmul>(obj) for ncmul objects. */
-template<> inline bool is_exactly_a<ncmul>(const basic & obj)
-{
-       return obj.tinfo()==TINFO_ncmul;
-}
-
 } // namespace GiNaC
 
-#endif // ndef __GINAC_NCMUL_H__
+#endif // ndef GINAC_NCMUL_H