Changeset 5e44ac2 for src/Concurrency/Waitfor.cc

Timestamp:

Aug 15, 2018, 1:58:02 PM (7 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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

90cac45

Parents:

d7d63e5 (diff), 7bd4cc9 (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' into demangler

File:

• src/Concurrency/Waitfor.cc (modified) (1 diff)

src/Concurrency/Waitfor.cc

@@ -250 +250 @@
         Statement * GenerateWaitForPass::postmutate( WaitForStmt * waitfor ) {
                 if( !decl_monitor || !decl_acceptable || !decl_mask )
-                        SemanticError( waitfor, "waitfor keyword requires monitors to be in scope, add #include <monitor>" );
+                        SemanticError( waitfor, "waitfor keyword requires monitors to be in scope, add #include <monitor.hfa>" );
 
                 CompoundStmt * stmt = new CompoundStmt();