Changeset 26 for trunk/Classes/config_cache.cpp

Timestamp:

2010-05-28 07:39:52 (2 years ago)

Author:

kpoole

Message:

Episode 5

File:

• trunk/Classes/config_cache.cpp (modified) (3 diffs)

trunk/Classes/config_cache.cpp

@@ -536 +536 @@
 char *loadStringTable = NULL;
 unsigned long totalStringSize=0;
+std::map<std::string, int> stringTableHelper;
 
 void cacheFreeStringTable(void)
 {
     stringTable.clear();
+    stringTableHelper.clear();
     stringOffsets.clear();
     if (loadStringTable)
@@ -555 +557 @@
     
     // check if vector contains element
-    std::vector<std::string>::iterator it;
-    it = std::find(stringTable.begin(), stringTable.end(), str);
-    if (it == stringTable.end())
+    //std::vector<std::string>::iterator it;
+    //it = std::find(stringTable.begin(), stringTable.end(), str);
+    std::map<std::string, int>::iterator fnd;
+    fnd = stringTableHelper.lower_bound(str);
+    
+    if (fnd != stringTableHelper.end() && !(stringTableHelper.key_comp()(str, fnd->first)))
+    {
+        //pos = it - stringTable.begin();
+        pos = fnd->second;
+    }
+    else
     {
         stringTable.push_back(str);
@@ -563 +573 @@
         pos = stringTable.size() - 1;
         totalStringSize += str.size();
-    }
-    else
-    {
-        pos = it - stringTable.begin();
+        stringTableHelper.insert(fnd, std::make_pair<std::string, int>(str, pos));
     }