Merge branch 'ginac_1-5' of ssh://www.ginac.de/srv/git/ginac into ginac_1-5

[ginac.git] / ginac / mul.h

diff --git a/ginac/mul.h b/ginac/mul.h
index 168342de61233eb3d59de30c9fc1c403e2e0266c..50ab6edc0b6f0e2da608ff07708c943ab46a93f9 100644 (file)
--- a/ginac/mul.h
+++ b/ginac/mul.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's products of expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2007 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2009 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_MUL_H__
-#define __GINAC_MUL_H__
+#ifndef GINAC_MUL_H
+#define GINAC_MUL_H
 
 #include "expairseq.h"
 
@@ -68,7 +68,7 @@ protected:
        ex derivative(const symbol & s) const;
        ex eval_ncmul(const exvector & v) const;
        unsigned return_type() const;
-       tinfo_t return_type_tinfo() const;
+       return_type_t return_type_tinfo() const;
        ex thisexpairseq(const epvector & v, const ex & oc, bool do_index_renaming = false) const;
        ex thisexpairseq(std::auto_ptr<epvector> vp, const ex & oc, bool do_index_renaming = false) const;
        expair split_ex_to_pair(const ex & e) const;
@@ -98,7 +98,8 @@ protected:
        static bool can_be_further_expanded(const ex & e);
        std::auto_ptr<epvector> expandchildren(unsigned options) const;
 };
+GINAC_DECLARE_UNARCHIVER(mul);
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_MUL_H__
+#endif // ndef GINAC_MUL_H