* Prepare for landing of version 0.7.3.

[ginac.git] / ginac / ncmul.h

diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index acb4edee6bb6c9e35072108a9c349aa3ff803340..5373a75ba329fe697a75e2a19ea00b202a3dbd8d 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-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -40,35 +40,24 @@ class ncmul : public exprseq
 
 // member functions
 
-       // default constructor, destructor, copy constructor assignment operator and helpers
-public:
-       ncmul();
-       ~ncmul();
-       ncmul(const ncmul & other);
-       const ncmul & operator=(const ncmul & other);
-protected:
-       void copy(const ncmul & other);
-       void destroy(bool call_parent);
-
        // other constructors
 public:
        ncmul(const ex & lh, const ex & rh);
        ncmul(const ex & f1, const ex & f2, const ex & f3);
        ncmul(const ex & f1, const ex & f2, const ex & f3,
-                 const ex & f4);
+             const ex & f4);
        ncmul(const ex & f1, const ex & f2, const ex & f3,
-                 const ex & f4, const ex & f5);
+             const ex & f4, const ex & f5);
        ncmul(const ex & f1, const ex & f2, const ex & f3,
-                 const ex & f4, const ex & f5, const ex & f6);
+             const ex & f4, const ex & f5, const ex & f6);
        ncmul(const exvector & v, bool discardable=false);
        ncmul(exvector * vp); // vp will be deleted
 
        // functions overriding virtual functions from bases classes
 public:
-       basic * duplicate() const;
        void print(std::ostream & os, unsigned upper_precedence) const;
        void printraw(std::ostream & os) const;
-       void printcsrc(std::ostream & os, unsigned upper_precedence) const;
+       void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence = 0) const;
        bool info(unsigned inf) const;
        int degree(const symbol & s) const;
        int ldegree(const symbol & s) const;
@@ -81,7 +70,6 @@ public:
        ex thisexprseq(exvector * vp) const;
 protected:
        ex derivative(const symbol & s) const;
-       int compare_same_type(const basic & other) const;
        unsigned return_type(void) const;
        unsigned return_type_tinfo(void) const;
        
@@ -102,11 +90,6 @@ protected:
        static unsigned precedence;
 };
 
-// global constants
-
-extern const ncmul some_ncmul;
-extern const type_info & typeid_ncmul;
-
 // friend funtions 
 
 ex nonsimplified_ncmul(const exvector & v);