- rotate_31() and golden_hash_ratio() moved to utils.h

[ginac.git] / ginac / mul.h

diff --git a/ginac/mul.h b/ginac/mul.h
index 46b3791e40c3243e72726002ceba69b1833b59b4..19dad491c701eb65bd68ebd6ec77e910cdfb2da0 100644 (file)
--- a/ginac/mul.h
+++ b/ginac/mul.h
@@ -25,6 +25,8 @@
 
 #include <ginac/expairseq.h>
 
 
 #include <ginac/expairseq.h>
 

+namespace GiNaC {
+

 /** Product of expressions. */
 class mul : public expairseq
 {
 /** Product of expressions. */
 class mul : public expairseq
 {


@@ -80,8 +82,6 @@ protected:
     unsigned return_type_tinfo(void) const;
     ex thisexpairseq(epvector const & v, ex const & oc) const;
     ex thisexpairseq(epvector * vp, ex const & oc) const;
     unsigned return_type_tinfo(void) const;
     ex thisexpairseq(epvector const & v, ex const & oc) const;
     ex thisexpairseq(epvector * vp, ex const & oc) const;

-    void printpair(ostream & os, expair const & p,
-                   unsigned upper_precedence) const;

     expair split_ex_to_pair(ex const & e) const;
     expair combine_ex_with_coeff_to_pair(ex const & e,
                                          ex const & c) const;
     expair split_ex_to_pair(ex const & e) const;
     expair combine_ex_with_coeff_to_pair(ex const & e,
                                          ex const & c) const;


@@ -113,6 +113,12 @@ protected:
 extern const mul some_mul;
 extern type_info const & typeid_mul;
 
 extern const mul some_mul;
 extern type_info const & typeid_mul;
 

-#define ex_to_mul(X) static_cast<mul const &>(*(X).bp)
+// utility functions
+inline const mul &ex_to_mul(const ex &e)
+{
+       return static_cast<const mul &>(*e.bp);
+}
+
+} // namespace GiNaC

 
 #endif // ndef __GINAC_MUL_H__
 
 #endif // ndef __GINAC_MUL_H__