Changeset fd061ed3 for src/tests

Timestamp:

Feb 28, 2017, 1:49:12 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

14f6bb39

Parents:

31868da (diff), cc7f4b1 (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:software/cfa/cfa-cc

File:

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

src/tests/monitor.c

@@ -6 +6 @@
 struct global_t {
         int value;
-        monitor m;
+        __monitor_t m;
 };
 
@@ -16 +16 @@
 
 void increment( /*mutex*/ global_t * this ) {
-        monitor_guard g = { &this->m };
-        this->value += 1;
+        monitor_guard_t g1 = { &this->m };
+        {
+                monitor_guard_t g2 = { &this->m };
+                {
+                        monitor_guard_t g3 = { &this->m };
+                        this->value += 1;
+                }
+        }
 }