registered_class_info: use typeid() instead of tinfo_static.

[ginac.git] / ginac / registrar.cpp

diff --git a/ginac/registrar.cpp b/ginac/registrar.cpp
index f95b20131989c29e26b02366f1c8d62a67308665..5a4d8903660fd74a14e28682634790878e404188 100644 (file)
--- a/ginac/registrar.cpp
+++ b/ginac/registrar.cpp
@@ -3,7 +3,7 @@
  *  GiNaC's class registrar (for class basic and all classes derived from it). */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2008 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,45 +17,25 @@
  *
  *  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
  */
 
 #include <string>
+#include <map>
 #include <stdexcept>
 
 #include "registrar.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
-registered_class_info *first_registered_class = NULL;
-
-/** Find registered_class_info strucure by class name. */
-static inline registered_class_info *find_registered_class_info(const string &class_name)
+std::type_info const* find_tinfo_key(const std::string &class_name)
 {
-       registered_class_info *p = first_registered_class;
-       while (p) {
-               if (class_name == p->name)
-                       return p;
-               p = p->next;
-       }
-       throw (std::runtime_error("class '" + class_name + "' not registered"));
+       return registered_class_info::find(class_name)->options.get_id();
 }
 
-unsigned int find_tinfo_key(const string &class_name)
+unarch_func find_unarch_func(const std::string &class_name)
 {
-       registered_class_info *p = find_registered_class_info(class_name);
-       return p->tinfo_key;
+       return registered_class_info::find(class_name)->options.get_unarch_func();
 }
 
-unarch_func find_unarch_func(const string &class_name)
-{
-       registered_class_info *p = find_registered_class_info(class_name);
-       return p->unarchive;
-}
-
-
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC