Changeset 9b443c7f for src/tests/monitor.c

Timestamp:

Mar 15, 2017, 5:02:25 PM (9 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:

f2e40a9f

Parents:

5a3ac84 (diff), 29f44a74 (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) (3 diffs)

src/tests/monitor.c

@@ -2 +2 @@
 #include <kernel>
 #include <monitor>
-#include <threads>
+#include <thread>
 
 struct global_t {
         int value;
-        __monitor_t m;
+        monitor_desc m;
 };
 
@@ -16 +16 @@
 
 void increment( /*mutex*/ global_t * this ) {
-        __monitor_t * mon = &this->m;
+        monitor_desc * mon = &this->m;
         monitor_guard_t g1 = { &mon };
         {
@@ -27 +27 @@
 }
 
-struct MyThread { thread t; };
+struct MyThread { thread_desc t; };
 
 DECL_THREAD(MyThread);