implemented operator-> for the iterators

[ginac.git] / ginac / structure.h

diff --git a/ginac/structure.h b/ginac/structure.h
index 23ae93c0940a6de0e98dc0864a46af4604b4eca1..1c28d7501a3fb40c30ef742f372546e5bb90b13a 100644 (file)
--- a/ginac/structure.h
+++ b/ginac/structure.h
@@ -116,7 +116,7 @@ class structure : public basic, public ComparisonPolicy<T> {
        GINAC_DECLARE_REGISTERED_CLASS(structure, basic)
 
        // helpers
-       static unsigned get_tinfo() { return reg_info.tinfo_key; }
+       static unsigned get_tinfo() { return reg_info.options.get_id(); }
        static const char *get_class_name() { return "structure"; }
 
        // constructors
@@ -160,7 +160,7 @@ protected:
 public:
 
        // substitutions
-       ex subs(const lst & ls, const lst & lr, unsigned options = 0) const { return inherited::subs(ls, lr, options); }
+       ex subs(const exmap & m, unsigned options = 0) const { return inherited::subs(m, options); }
 
        // function mapping
        ex map(map_function & f) const { return inherited::map(f); }
@@ -181,7 +181,7 @@ public:
        ex series(const relational & r, int order, unsigned options = 0) const { return inherited::series(r, order, options); }
 
        // rational functions
-       ex normal(lst & sym_lst, lst & repl_lst, int level = 0) const { return inherited::normal(sym_lst, repl_lst, level); }
+       ex normal(exmap & repl, exmap & rev_lookup, int level = 0) const { return inherited::normal(repl, rev_lookup, level); }
        ex to_rational(lst & repl_lst) const { return inherited::to_rational(repl_lst); }
        ex to_polynomial(lst & repl_lst) const { return inherited::to_polynomial(repl_lst); }
 
@@ -256,10 +256,7 @@ int structure<T, CP>::compare_same_type(const basic & other) const
 }
 
 template <class T, template <class> class CP>
-registered_class_info structure<T, CP>::reg_info(structure::get_class_name(), "basic", next_structure_tinfo_key++, &structure::unarchive);
-
-template <class T, template <class> class CP>
-const char *structure<T, CP>::class_name() const { return reg_info.name; }
+registered_class_info structure<T, CP>::reg_info = registered_class_info(registered_class_options(structure::get_class_name(), "basic", next_structure_tinfo_key++, &structure::unarchive));
 
 
 } // namespace GiNaC