Identity map.

lout/identity.cc

@@ -55,9 +55,7 @@ void IdentifiableObject::Class::intoStringBuffer(misc::StringBuffer *sb)
    sb->append (">");
 }
 
-HashTable <ConstString, IdentifiableObject::Class>
+std::map< std::string, std::unique_ptr< IdentifiableObject::Class > > IdentifiableObject::classesByName;
-   *IdentifiableObject::classesByName =
-      new HashTable<ConstString, IdentifiableObject::Class> (true, true);
 
 std::vector< IdentifiableObject::Class * > IdentifiableObject::classesById;
 
@@ -83,13 +81,11 @@ void IdentifiableObject::intoStringBuffer(misc::StringBuffer *sb)
  */
 void IdentifiableObject::registerName (const char *className, int *classId)
 {
-   ConstString str (className);
+   Class *klass = classesByName.at( className ).get();
-   Class *klass = classesByName->get (&str);
    if (klass == NULL) {
       klass = new Class (currentlyConstructedClass, classesById.size (),
                          className);
-      ConstString *key = new ConstString (className);
+      classesByName.emplace (className, klass);
-      classesByName->put (key, klass);
       classesById.push_back (klass);
       *classId = klass->id;
    }

lout/identity.hh

@@ -1,6 +1,10 @@
 #ifndef __LOUT_OBJECTX_HH__
 #define __LOUT_OBJECTX_HH__
 
+#include <memory>
+#include <vector>
+#include <map>
+
 #include "object.hh"
 #include "container.hh"
 #include "signal.hh"
@@ -110,8 +114,7 @@ private:
       void intoStringBuffer(misc::StringBuffer *sb);
    };
 
-   static container::typed::HashTable <object::ConstString,
+   static std::map< std::string, std::unique_ptr< Class > > classesByName;
-                                       Class> *classesByName;
    static std::vector< Class * > classesById;
    static Class *currentlyConstructedClass;