Changeset 436c0de for src/libcfa/concurrency/monitor

Timestamp:

Jun 18, 2017, 9:22:22 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

f1e80d8

Parents:

ade20d0 (diff), 42b0d73 (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

Conflicts:

src/InitTweak/GenInit.cc

File:

• src/libcfa/concurrency/monitor (modified) (2 diffs)

src/libcfa/concurrency/monitor

@@ -26 +26 @@
 static inline void ?{}(monitor_desc * this) {
         this->owner = NULL;
-      this->stack_owner = NULL;
+        this->stack_owner = NULL;
         this->recursion = 0;
 }
@@ -33 +33 @@
         monitor_desc ** m;
         int count;
-      monitor_desc ** prev_mntrs;
-      unsigned short  prev_count;
+        monitor_desc ** prev_mntrs;
+        unsigned short  prev_count;
 };