Changeset fd782b2 for src/tests

Timestamp:

Sep 15, 2016, 10:55:52 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:

aa8f9df

Parents:

f006f01 (diff), 1eba452 (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' into tuples

Conflicts:

src/Parser/ParseNode.h

Location:

src/tests

Files:

• .expect/declarationErrors.txt (modified) (1 diff)
• avltree/avl_test.c (modified) (1 diff)

src/tests/.expect/declarationErrors.txt

@@ -2 +2 @@
 Error: duplicate static in declaration of x1: static const volatile short int 
 
-Error: multiple extern & static in declaration of x2: extern const volatile short int 
+Error: conflicting extern & static in declaration of x2: extern const volatile short int 
 
-Error: multiple extern & auto, multiple extern & static, multiple extern & static, duplicate extern in declaration of x3: extern const volatile short int 
+Error: conflicting extern & auto, conflicting extern & static, conflicting extern & static, duplicate extern in declaration of x3: extern const volatile short int 
 
 Error: duplicate static in declaration of x4: static const volatile instance of const volatile struct __anonymous0

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);