Changeset 04e6f93 for src/Concurrency/Waitfor.cc

Timestamp:

Feb 27, 2020, 4:04:25 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

a037f85

Parents:

41efd33 (diff), 930b504 (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/Concurrency/Waitfor.cc (modified) (1 diff)

src/Concurrency/Waitfor.cc

@@ -244 +244 @@
                         decl_mask = decl;
                 }
-                else if( decl->name == "monitor_desc" ) {
+                else if( decl->name == "$monitor" ) {
                         assert( !decl_monitor );
                         decl_monitor = decl;