Changeset 777ed2b for src/prelude

Timestamp:

Jul 11, 2018, 11:55:59 AM (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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

0fc52b6

Parents:

fc20514 (diff), 7de22b28 (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:

fix conflicts

File:

• src/prelude/prelude.old.cf (modified) (1 diff)

src/prelude/prelude.old.cf

@@ -728 +728 @@
 forall( dtype DT ) void ?{}(       volatile  DT *          &,                   DT * );
 forall( dtype DT ) void ?{}(       volatile  DT *          &,       volatile    DT * );
-
 forall( dtype DT ) void ?{}( const volatile  DT *          &,                   DT * );
 forall( dtype DT ) void ?{}( const volatile  DT *          &, const             DT * );