X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Findexed.h;h=2c4f551106c7cf66d1e62eb9d70c883afb169f6a;hp=3c8951a1ee4b4af48a7108d01998fb59083cff27;hb=852fb174c43b49a3ce1b568f959d23e8a1959ee1;hpb=67467d256b44f5e08498ca81c946d9ffaa25d1e2

diff --git a/ginac/indexed.h b/ginac/indexed.h
index 3c8951a1..2c4f5511 100644
--- a/ginac/indexed.h
+++ b/ginac/indexed.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's indexed expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2008 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,16 +20,15 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_INDEXED_H__
-#define __GINAC_INDEXED_H__
-
-#include <map>
+#ifndef GINAC_INDEXED_H
+#define GINAC_INDEXED_H
 
 #include "exprseq.h"
 #include "wildcard.h"
 
-namespace GiNaC {
+#include <map>
 
+namespace GiNaC {
 
 class scalar_products;
 class symmetry;
@@ -139,8 +138,8 @@ public:
 
 	// internal constructors
 	indexed(const symmetry & symm, const exprseq & es);
-	indexed(const symmetry & symm, const exvector & v, bool discardable = false);
-	indexed(const symmetry & symm, std::auto_ptr<exvector> vp);
+	indexed(const symmetry & symm, const exvector & v);
+	indexed(const symmetry & symm, exvector && v);
 
 	// functions overriding virtual functions from base classes
 public:
@@ -151,12 +150,16 @@ public:
 	ex imag_part() const;
 	exvector get_free_indices() const;
 
+	/** Save (a.k.a. serialize) indexed object into archive. */
+	void archive(archive_node& n) const;
+	/** Read (a.k.a. deserialize) indexed object from archive. */
+	void read_archive(const archive_node& n, lst& syms);
 protected:
 	ex derivative(const symbol & s) const;
 	ex thiscontainer(const exvector & v) const;
-	ex thiscontainer(std::auto_ptr<exvector> vp) const;
+	ex thiscontainer(exvector && v) const;
 	unsigned return_type() const;
-	tinfo_t return_type_tinfo() const { return op(0).return_type_tinfo(); }
+	return_type_t return_type_tinfo() const { return op(0).return_type_tinfo(); }
 	ex expand(unsigned options = 0) const;
 
 	// new virtual functions which can be overridden by derived classes
@@ -198,6 +201,7 @@ protected:
 protected:
 	ex symtree; /**< Index symmetry (tree of symmetry objects) */
 };
+GINAC_DECLARE_UNARCHIVER(indexed);
 
 
 class spmapkey {
@@ -251,7 +255,7 @@ protected:
 exvector get_all_dummy_indices(const ex & e);
 
 /** More reliable version of the form. The former assumes that e is an
-  * expanded epxression. */
+  * expanded expression. */
 exvector get_all_dummy_indices_safely(const ex & e);
 
 /** Returns b with all dummy indices, which are listed in va, renamed 
@@ -275,10 +279,10 @@ lst rename_dummy_indices_uniquely(const exvector & va, const exvector & vb);
  *  indices with the corresponding numeric values without variance.
  *
  *  @param e the given expression
- *  @param subs_idx indicates if variance of dummy indixes should be neglected
+ *  @param subs_idx indicates if variance of dummy indices should be neglected
  */
 ex expand_dummy_sum(const ex & e, bool subs_idx = false);
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_INDEXED_H__
+#endif // ndef GINAC_INDEXED_H