Changeset 10988 for code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.cc

Timestamp:

Dec 28, 2015, 11:22:21 PM (9 years ago)

Author:

landauf

Message:

use an unordered map and type_index to store identifiers by typeid

File:

• code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.cc (modified) (3 diffs)

code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.cc

@@ -60 +60 @@
 
         this->identifiers_.insert(identifier);
+        this->identifierByTypeIndex_[identifier->getTypeInfo()] = identifier;
         this->identifierByString_[identifier->getName()] = identifier;
         this->identifierByLowercaseString_[getLowercase(identifier->getName())] = identifier;
@@ -71 +72 @@
     {
         this->identifiers_.erase(identifier);
+        this->identifierByTypeIndex_.erase(identifier->getTypeInfo());
         this->identifierByString_.erase(identifier->getName());
         this->identifierByLowercaseString_.erase(getLowercase(identifier->getName()));
@@ -258 +260 @@
     Identifier* IdentifierManager::getIdentifierByTypeInfo(const std::type_info& typeInfo)
     {
-        // TODO: use std::type_index and a map to find identifiers by type_info (only with c++11)
-        for (Identifier* identifer : this->identifiers_)
-            if (identifer->getTypeInfo() == typeInfo)
-                return identifer;
-        return nullptr;
+        auto it = this->identifierByTypeIndex_.find(typeInfo);
+        if (it != this->identifierByTypeIndex_.end())
+            return it->second;
+        else
+            return nullptr;
     }