Changeset 3f12158 for src/main.cc

Timestamp:

Jul 7, 2017, 11:55:37 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

aaron-thesis, arm-eh, 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:

7c03d6d

Parents:

f32e53e (diff), 54d714e (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/main.cc (modified) (2 diffs)

src/main.cc

@@ -10 +10 @@
 // Author           : Richard C. Bilson
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun 29 12:46:50 2017
-// Update Count     : 441
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Jul  7 11:13:00 2017
+// Update Count     : 442
 //
 
@@ -206 +206 @@
                                 FILE * builtins = fopen( libcfap | treep ? "../prelude/builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
                                 assertf( builtins, "cannot open builtins.cf\n" );
-                                parse( builtins, LinkageSpec::Builtin );
+                                parse( builtins, LinkageSpec::BuiltinCFA );
                         } // if
                 } // if