Changeset 32a2a99 for src/tests/declarationErrors.c

Timestamp:

Aug 30, 2016, 4:25:55 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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:

90e2334, fa463f1

Parents:

a2a8d2a6 (diff), ced2e989 (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

File:

• src/tests/declarationErrors.c (modified) (2 diffs)

src/tests/declarationErrors.c ¶

@@ -10 +10 @@
 // Created On       : Wed Aug 17 08:23:43 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 17 08:27:15 2016
-// Update Count     : 2
+// Last Modified On : Thu Aug 25 18:16:40 2016
+// Update Count     : 5
 // 
 
-const short static int volatile x4;
-const static volatile short int x4;
 static short int volatile static const x9;                              // duplicate static
 struct { int i; } const static volatile static x18;             // duplicate static
@@ -29 +27 @@
 volatile static const volatile inline int f06();                // duplicate volatile
 const static const volatile int inline f07();                   // duplicate const
-volatile static const int inline volatile f08();                // duplicate volatile
+volatile static const int inline const volatile f08();          // duplicate volatile
+
+volatile static const int inline const volatile f09();          // duplicate volatile
+volatile static const int inline const volatile f09();          // duplicate volatile
 
 //Dummy main