mul::expand(): Remove unused variable.

[ginac.git] / ginac / registrar.h

diff --git a/ginac/registrar.h b/ginac/registrar.h
index 33e54de5568119008544097c1561d07072343682..333b5f070f6ffca2c38429c1f9ab698bf9b0968e 100644 (file)
--- a/ginac/registrar.h
+++ b/ginac/registrar.h
@@ -3,7 +3,7 @@
  *  GiNaC's class registrar (for class basic and all classes derived from it). */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2005 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
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef __GINAC_REGISTRAR_H__
@@ -76,7 +76,6 @@ public:
                return *this;
        }
 
-private:
        void set_print_func(unsigned id, const print_functor & f)
        {
                if (id >= print_dispatch_table.size())
@@ -84,6 +83,7 @@ private:
                print_dispatch_table[id] = f;
        }
 
+private:
        const char *name;         /**< Class name. */
        const char *parent_name;  /**< Name of superclass. */
        unsigned tinfo_key;       /**< TINFO_* key. */
@@ -101,8 +101,9 @@ public: \
 private: \
        static GiNaC::registered_class_info reg_info; \
 public: \
-       static const GiNaC::registered_class_info &get_class_info_static() { return reg_info; } \
+       static GiNaC::registered_class_info &get_class_info_static() { return reg_info; } \
        virtual const GiNaC::registered_class_info &get_class_info() const { return classname::get_class_info_static(); } \
+       virtual GiNaC::registered_class_info &get_class_info() { return classname::get_class_info_static(); } \
        virtual const char *class_name() const { return classname::get_class_info_static().options.get_name(); } \
        \
        classname(const GiNaC::archive_node &n, GiNaC::lst &sym_lst); \
@@ -152,6 +153,21 @@ extern unsigned find_tinfo_key(const std::string &class_name);
 extern unarch_func find_unarch_func(const std::string &class_name);
 
 
+/** Add or replace a print method. */
+template <class Alg, class Ctx, class T, class C>
+extern void set_print_func(void f(const T &, const C & c, unsigned))
+{
+       Alg::get_class_info_static().options.set_print_func(Ctx::get_class_info_static().options.get_id(), f);
+}
+
+/** Add or replace a print method. */
+template <class Alg, class Ctx, class T, class C>
+extern void set_print_func(void (T::*f)(const C &, unsigned))
+{
+       Alg::get_class_info_static().options.set_print_func(Ctx::get_class_info_static().options.get_id(), f);
+}
+
+
 } // namespace GiNaC
 
 #endif // ndef __GINAC_REGISTRAR_H__