Changeset 168c007 for src/libcfa/concurrency/monitor

Timestamp:

Mar 21, 2017, 12:50:27 PM (9 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:

da6d4566, f5392c1

Parents:

94a8123 (diff), e04b636 (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/libcfa/concurrency/monitor (modified) (2 diffs)

src/libcfa/concurrency/monitor

@@ -34 +34 @@
 }
 
-//Basic entering routine
-void enter(monitor_desc *);
-void leave(monitor_desc *);
-
 //Array entering routine
 void enter(monitor_desc **, int count);
@@ -49 +45 @@
 static inline int ?<?(monitor_desc* lhs, monitor_desc* rhs) {
         return ((intptr_t)lhs) < ((intptr_t)rhs);
-}
-
-static inline void ?{}( monitor_guard_t * this, monitor_desc ** m ) {
-        this->m = m;
-        this->count = 1;
-        enter( *this->m );
 }