Added a document about the coding conventions used in GiNaC. Corrections,

[ginac.git] / ginac / ncmul.h

diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index 072ebfbbd13ea19cac4cfd45856c2e7771ca820d..0139a63fe74dce0f8be73f16763bf52d3e110213 100644 (file)
--- a/ginac/ncmul.h
+++ b/ginac/ncmul.h
@@ -49,11 +49,10 @@ 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:
-       void print(const print_context & c, unsigned level = 0) const;
        unsigned precedence() const {return 50;}
        bool info(unsigned inf) const;
        int degree(const ex & s) const;
@@ -64,7 +63,7 @@ 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;
 
 protected:
        ex derivative(const symbol & s) const;
@@ -76,6 +75,8 @@ protected:
 
        // non-virtual functions in this class
 protected:
+       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;