- files which are generated by perl scripts are made before compilation

[ginac.git] / ginac / mul.h

diff --git a/ginac/mul.h b/ginac/mul.h
index ee1993764e421598b5dc75f02ceb3a4f1c979d92..19dad491c701eb65bd68ebd6ec77e910cdfb2da0 100644 (file)
--- a/ginac/mul.h
+++ b/ginac/mul.h
@@ -1,7 +1,8 @@
 /** @file mul.h
  *
- *  Interface to GiNaC's products of expressions.
- *
+ *  Interface to GiNaC's products of expressions. */
+
+/*
  *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -22,7 +23,9 @@
 #ifndef __GINAC_MUL_H__
 #define __GINAC_MUL_H__
 
-class mul;
+#include <ginac/expairseq.h>
+
+namespace GiNaC {
 
 /** Product of expressions. */
 class mul : public expairseq
@@ -79,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;
-    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;
@@ -112,7 +113,12 @@ protected:
 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);
+}
 
-#endif // ndef __GINAC_MUL_H__
+} // namespace GiNaC
 
+#endif // ndef __GINAC_MUL_H__