Changeset 66f8528 for src/tests/.expect/64/declarationSpecifier.txt

Timestamp:

Dec 15, 2016, 5:16:42 PM (5 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

aaron-thesis, arm-eh, 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, resolv-new, with_gc

Children:

43385ca, f7ff3fb

Parents:

5802a4f (diff), 596f987b (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/ResolvExpr/CommonType.cc
src/tests/.expect/32/extension.txt
src/tests/.expect/32/gccExtensions.txt
src/tests/.expect/64/declarationSpecifier.txt
src/tests/.expect/64/extension.txt
src/tests/.expect/64/gccExtensions.txt
src/tests/.expect/castError.txt
src/tests/Makefile.am

File:

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

src/tests/.expect/64/declarationSpecifier.txt

@@ -623 +623 @@
 int main(int __argc__i_1, const char **__argv__PPCc_1){
     int ___retval_main__i_1;
-    ((void)(___retval_main__i_1=0) /* ?{} */);
+    ((void)(___retval_main__i_1=((int )0)) /* ?{} */);
     return ((int )___retval_main__i_1);
 }