Changes in src/SymTab/Validate.cc [9feb34b:44547b0]

File:

• src/SymTab/Validate.cc (modified) (3 diffs)

src/SymTab/Validate.cc

@@ -55 +55 @@
 #include "Common/ScopedMap.h"          // for ScopedMap
 #include "Common/SemanticError.h"      // for SemanticError
-#include "Common/ToString.hpp"         // for toCString
 #include "Common/UniqueName.h"         // for UniqueName
-#include "Common/utility.h"            // for cloneAll, deleteAll
+#include "Common/utility.h"            // for operator+, cloneAll, deleteAll
 #include "CompilationState.h"          // skip some passes in new-ast build
 #include "Concurrency/Keywords.h"      // for applyKeywords
@@ -64 +63 @@
 #include "InitTweak/GenInit.h"         // for fixReturnStatements
 #include "InitTweak/InitTweak.h"       // for isCtorDtorAssign
-#include "ResolvExpr/typeops.h"        // for extractResultType
-#include "ResolvExpr/Unify.h"          // for typesCompatible
+#include "ResolvExpr/typeops.h"        // for typesCompatible
 #include "ResolvExpr/Resolver.h"       // for findSingleExpression
 #include "ResolvExpr/ResolveTypeof.h"  // for resolveTypeof
@@ -864 +862 @@
 
         void ReplaceTypedef::premutate( TypeDecl * typeDecl ) {
-                typedefNames.erase( typeDecl->name );
+                TypedefMap::iterator i = typedefNames.find( typeDecl->name );
+                if ( i != typedefNames.end() ) {
+                        typedefNames.erase( i ) ;
+                } // if
+
                 typedeclNames.insert( typeDecl->name, typeDecl );
         }