Changeset e213560 for src/prelude

Timestamp:

Jul 26, 2017, 9:20:59 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

ab6ed1e

Parents:

15d1cc3 (diff), 2edd80ae (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 plg2:software/cfa/cfa-cc

File:

• src/prelude/builtins.c (modified) (2 diffs)

src/prelude/builtins.c

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// builtins.c -- 
-// 
+//
+// builtins.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Fri Jul 21 16:21:03 2017
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 10:34:20 2017
-// Update Count     : 13
-// 
+// Last Modified By : Andrew Beach
+// Last Modified On : Tus Jul 25 15:33:00 2017
+// Update Count     : 14
+//
 
 // exception implementation
@@ -18 +18 @@
 typedef unsigned long long __cfaabi_exception_type_t;
 
+#include "../libcfa/virtual.h"
 #include "../libcfa/exception.h"