replaced "precedence" static member variable by virtual precedence() function

[ginac.git] / ginac / ncmul.h

diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index a4a77eb027e5423becdf5aff1f7dd437336ec38c..f3fc1019dcb5df152cafb8ca1034971ab3a0ac5d 100644 (file)
--- a/ginac/ncmul.h
+++ b/ginac/ncmul.h
@@ -25,9 +25,7 @@
 
 #include "exprseq.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 /** Non-commutative product of expressions. */
 class ncmul : public exprseq
@@ -55,23 +53,19 @@ public:
 
        // 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 type, unsigned upper_precedence = 0) const;
+       void print(const print_context & c, unsigned level = 0) const;
+       unsigned precedence(void) const {return 50;}
        bool info(unsigned inf) const;
-       int degree(const symbol & s) const;
-       int ldegree(const symbol & s) const;
+       int degree(const ex & s) const;
+       int ldegree(const ex & s) const;
        ex expand(unsigned options=0) const;
-       ex coeff(const symbol & s, int n=1) const;
+       ex coeff(const ex & s, int n=1) const;
        ex eval(int level=0) const;
-       ex subs(const lst & ls, const lst & lr) const;
-       exvector get_indices(void) const;
+       exvector get_free_indices(void) const;
        ex thisexprseq(const exvector & v) const;
        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;
        
@@ -85,11 +79,6 @@ protected:
        exvector expandchildren(unsigned options) const;
 public:
        const exvector & get_factors(void) const;
-
-// member variables
-
-protected:
-       static unsigned precedence;
 };
 
 // friend funtions 
@@ -103,8 +92,6 @@ inline const ncmul &ex_to_ncmul(const ex &e)
        return static_cast <const ncmul &>(*e.bp);
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_NCMUL_H__