Changeset 8d7bef2 for src/SymTab

Timestamp:

Mar 20, 2018, 5:12:25 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

7e4b44db

Parents:

68f9c43

Message:

First compiling build of CFA-CC with GC

File:

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

src/SymTab/Validate.cc

@@ -197 +197 @@
                 void addImplicitTypedef( AggDecl * aggDecl );
 
-                typedef std::unique_ptr<TypedefDecl> TypedefDeclPtr;
-                typedef ScopedMap< std::string, std::pair< TypedefDeclPtr, int > > TypedefMap;
+                typedef ScopedMap< std::string, std::pair< TypedefDecl*, int > > TypedefMap;
                 typedef std::map< std::string, TypeDecl * > TypeDeclMap;
                 TypedefMap typedefNames;
@@ -746 +745 @@
                         }
                 } else {
-                        typedefNames[ tyDecl->get_name() ] = std::make_pair( TypedefDeclPtr( tyDecl ), scopeLevel );
+                        typedefNames[ tyDecl->get_name() ] = std::make_pair( tyDecl, scopeLevel );
                 } // if
 
@@ -839 +838 @@
                                 type = new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() );
                         } // if
-                        TypedefDeclPtr tyDecl( new TypedefDecl( aggDecl->get_name(), aggDecl->location, Type::StorageClasses(), type, aggDecl->get_linkage() ) );
-                        typedefNames[ aggDecl->get_name() ] = std::make_pair( std::move( tyDecl ), scopeLevel );
+                        TypedefDecl* tyDecl = new TypedefDecl{ aggDecl->get_name(), aggDecl->location, Type::StorageClasses(), type, aggDecl->get_linkage() };
+                        typedefNames[ aggDecl->get_name() ] = std::make_pair( tyDecl, scopeLevel );
                 } // if
         }