Synced to HEAD

[ginac.git] / ginac / indexed.h

diff --git a/ginac/indexed.h b/ginac/indexed.h
index 21947ff03728994518d4d0189b44e9b793805b63..f4891490a09d7d8b84521e17773977025074c11b 100644 (file)
--- a/ginac/indexed.h
+++ b/ginac/indexed.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's indexed expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2004 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
@@ -140,11 +140,10 @@ public:
        // internal constructors
        indexed(const symmetry & symm, const exprseq & es);
        indexed(const symmetry & symm, const exvector & v, bool discardable = false);
-       indexed(const symmetry & symm, exvector * vp); // vp will be deleted
+       indexed(const symmetry & symm, std::auto_ptr<exvector> vp);
 
        // functions overriding virtual functions from base classes
 public:
-       void print(const print_context & c, unsigned level = 0) const;
        unsigned precedence() const {return 55;}
        bool info(unsigned inf) const;
        ex eval(int level = 0) const;
@@ -153,7 +152,7 @@ public:
 protected:
        ex derivative(const symbol & s) const;
        ex thiscontainer(const exvector & v) const;
-       ex thiscontainer(exvector * vp) const;
+       ex thiscontainer(std::auto_ptr<exvector> vp) const;
        unsigned return_type() const { return return_types::commutative; }
        ex expand(unsigned options = 0) const;
 
@@ -185,6 +184,10 @@ public:
 
 protected:
        void printindices(const print_context & c, unsigned level) const;
+       void print_indexed(const print_context & c, const char *openbrace, const char *closebrace, unsigned level) const;
+       void do_print(const print_context & c, unsigned level) const;
+       void do_print_latex(const print_latex & c, unsigned level) const;
+       void do_print_tree(const print_tree & c, unsigned level) const;
        void validate() const;
 
        // member variables