Changeset 3bbd012 for src/tests/.expect/declarationErrors.txt

Timestamp:

Jul 31, 2018, 2:43:04 PM (8 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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

642bc83

Parents:

d1e0979 (diff), 04e367c (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 demangler

File:

• src/tests/.expect/declarationErrors.txt (modified) (1 diff)

src/tests/.expect/declarationErrors.txt

@@ -17 +17 @@
 
 
-declarationErrors.c:22:1 error: duplicate static in declaration of x6: static const volatile instance of type Int
+declarationErrors.c:22:1 error: duplicate static in declaration of x6: static const volatile Int
 
 declarationErrors.c:24:1 error: duplicate const in declaration of f01: static inline function