X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fncmul.h;h=f3fc1019dcb5df152cafb8ca1034971ab3a0ac5d;hp=5373a75ba329fe697a75e2a19ea00b202a3dbd8d;hb=b9cd4b49ffbfbf3e1c36a2b594ec3148a5baca64;hpb=1bd972bf8e4eeeb8aec6081100876e81a7f18450

diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index 5373a75b..f3fc1019 100644
--- 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,17 +53,15 @@ public:
 
 	// functions overriding virtual functions from bases classes
 public:
-	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:
@@ -83,11 +79,6 @@ protected:
 	exvector expandchildren(unsigned options) const;
 public:
 	const exvector & get_factors(void) const;
-
-// member variables
-
-protected:
-	static unsigned precedence;
 };
 
 // friend funtions 
@@ -101,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__