X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fregistrar.cpp;h=cc12f6033286581190a2606b0016580e7df5751c;hb=1acadaea2a80886aac7afa758d9b250880b6f186;hp=fc54830230016f1e4146656ae9e0155033124cb1;hpb=0a1b35cf1e59c9e3aae33de8febaa1c8f4bbe630;p=ginac.git

diff --git a/ginac/registrar.cpp b/ginac/registrar.cpp
index fc548302..cc12f603 100644
--- 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-2004 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
@@ -21,41 +21,21 @@
  */
 
 #include <string>
+#include <map>
 #include <stdexcept>
 
 #include "registrar.h"
 
-#ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
 
-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)
+unsigned 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_GINAC_NAMESPACE
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE