Changeset 4a7d895 for src/tests/declarationErrors.c

Timestamp:

Aug 20, 2016, 5:33:07 AM (9 years ago)

Author:

Aaron Moss <bruceiv@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, 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:

80722d0

Parents:

7b1bfc5 (diff), 2037f82 (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 plg2.cs.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/tests/declarationErrors.c

@@ -1 @@
-static short int volatile static const x9;              // duplicate static
-struct { int i; } const static volatile static x18;     // duplicate static
+// 
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// declarationErrors.c -- 
+// 
+// Author           : Peter A. Buhr
+// 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
+// 
+
+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
 struct { int i; } const static volatile static volatile x19; // duplicate static & volatile
 typedef int Int;
-static Int volatile static const x28;                   // duplicate static
+static Int volatile static const x28;                                   // duplicate static
+
+const static inline const volatile int f01();                   // duplicate const
+volatile inline const volatile static int f02();                // duplicate volatile
+const inline const volatile int static f03();                   // duplicate const
+volatile inline static const volatile int f04();                // duplicate volatile
+const static const inline volatile int f05();                   // duplicate const
+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
 
 //Dummy main
@@ -10 +36 @@
         return 0;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa declarationErrors.c" //
+// End: //