Changeset a56767c for src/examples/s.c

Timestamp:

Jan 11, 2016, 2:53:01 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

77acda06

Parents:

974906e2 (diff), 61f9356 (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 ctor

File:

• src/examples/s.c (modified) (2 diffs)

src/examples/s.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 27 18:42:39 2015
-// Update Count     : 2
+// Last Modified On : Sun Jan  3 22:38:45 2016
+// Update Count     : 3
 //
 
@@ -17 +17 @@
 
 void f() {
-//      int a;
-//      a ? 4 : 5;
+        int a;
+        a ? 4 : 5;
         1 ? 4 : 5;
         0 ? 4 : 5;