Changeset 1eba452 for src/tests

Timestamp:

Sep 15, 2016, 10:29:43 AM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

fc4a0fa, fd782b2

Parents:

96a10cdd (diff), 50c5cf3 (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:/u/cforall/software/cfa/cfa-cc

Conflicts:

src/Parser/parser.cc

File:

• src/tests/avltree/avl_test.c (modified) (1 diff)

src/tests/avltree/avl_test.c

@@ -14 +14 @@
 
   // int -> int
-  tree(int, int) * imap = create(-1, 0);
+  tree(int, int) * imap = create(-1, (int)0);
   insert(&imap, 12, 13);
   insert(&imap, 2, 3);