Changeset 33218c6 for src/SymTab/Autogen.cc

Timestamp:

Jul 26, 2017, 12:19:41 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

b947fb2

Parents:

e0a653d (diff), ea91c42 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/SymTab/Autogen.cc (modified) (2 diffs)

src/SymTab/Autogen.cc

@@ -10 +10 @@
 // Created On       : Thu Mar 03 15:45:56 2016
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Jun 28 15:30:00 2017
-// Update Count     : 61
+// Last Modified On : Fri Jul 14 16:41:00 2017
+// Update Count     : 62
 //
 #include "Autogen.h"
@@ -407 +407 @@
         void makeStructFunctions( StructDecl *aggregateDecl, StructInstType *refType, unsigned int functionNesting, std::list< Declaration * > & declsToAdd, const std::vector< FuncData > & data ) {
                 // Builtins do not use autogeneration.
-                if ( aggregateDecl->get_linkage() == LinkageSpec::Builtin ||
+                if ( aggregateDecl->get_linkage() == LinkageSpec::BuiltinCFA ||
                          aggregateDecl->get_linkage() == LinkageSpec::BuiltinC ) {
                         return;