added wildcard and spinormetric classes to check

[ginac.git] / ginac / mul.h

diff --git a/ginac/mul.h b/ginac/mul.h
index affef3ba0c7ba5f024af2d51b418c8c1de8aef52..d5a73ccf27ea1f188ff6e347a37fe07a768ba9f7 100644 (file)
--- a/ginac/mul.h
+++ b/ginac/mul.h
@@ -47,7 +47,8 @@ public:
        
        // functions overriding virtual functions from bases classes
 public:
-       void print(const print_context & c, unsigned level) 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 ex & s) const;
        int ldegree(const ex & s) const;
@@ -69,10 +70,8 @@ protected:
        ex thisexpairseq(const epvector & v, const ex & oc) const;
        ex thisexpairseq(epvector * vp, const ex & oc) const;
        expair split_ex_to_pair(const ex & e) const;
-       expair combine_ex_with_coeff_to_pair(const ex & e,
-                                                                                const ex & c) const;
-       expair combine_pair_with_coeff_to_pair(const expair & p,
-                                                                                  const ex & c) const;
+       expair combine_ex_with_coeff_to_pair(const ex & e, const ex & c) const;
+       expair combine_pair_with_coeff_to_pair(const expair & p, const ex & c) const;
        ex recombine_pair_to_ex(const expair & p) const;
        bool expair_needs_further_processing(epp it);
        ex default_overall_coeff(void) const;
@@ -87,11 +86,6 @@ protected:
        // non-virtual functions in this class
 protected:
        epvector * expandchildren(unsigned options) const;
-       
-// member variables
-       
-protected:
-       static unsigned precedence;
 };
 
 // utility functions