Ticket #2217: extended_type_info_files.patch

extended_type_info.cpp

@@ -93 +93 @@
     // remove entry in map which corresponds to this type
     do{
         if(this == *start){
-            x.erase(start);
-            break;
+            start = x.erase(start);
+        } else {
+            ++start;
         }
-    }while(++start != end);
+    }while(start != end);
 
     m_key = NULL;
 }

extended_type_info_typeid.cpp

@@ -89 +89 @@
     // remove entry in map which corresponds to this type
     do{
         if(this == *start){
-            x.erase(start);
-            break;
-    }
-    }while(++start != end);
+            start = x.erase(start);
+        } else {
+            ++start;
+        }
+    }while(start != end);
 
     m_ti = NULL;
 }