don't produce zero coefficients in a pseries object [Chris Dams]

[ginac.git] / ginac / ncmul.h

diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index 57cb08c7e37c8268a835f3ebab5bd0e912610060..436ae8c018e900eb7ae0174bb588ed215e637b1f 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-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
@@ -49,7 +49,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(exvector * vp); // vp will be deleted
+       ncmul(std::auto_ptr<exvector> vp);
 
        // functions overriding virtual functions from base classes
 public:
@@ -63,7 +63,8 @@ public:
        ex evalm() const;
        exvector get_free_indices() const;
        ex thiscontainer(const exvector & v) const;
-       ex thiscontainer(exvector * vp) const;
+       ex thiscontainer(std::auto_ptr<exvector> vp) const;
+       ex conjugate() const;
 
 protected:
        ex derivative(const symbol & s) const;
@@ -79,7 +80,7 @@ protected:
        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;
+       std::auto_ptr<exvector> expandchildren(unsigned options) const;
 public:
        const exvector & get_factors() const;
 };