Changeset cdbab55 for src/Concurrency/Keywords.cc

Timestamp:

Aug 21, 2018, 2:24:29 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

2a6292d

Parents:

2b79a70 (diff), efa8b6a (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/Concurrency/Keywords.cc (modified) (5 diffs)

src/Concurrency/Keywords.cc

@@ -97 +97 @@
                         "__thrd",
                         "get_thread",
-                        "thread keyword requires threads to be in scope, add #include <thread>",
+                        "thread keyword requires threads to be in scope, add #include <thread.hfa>",
                         true,
                         KeywordCastExpr::Thread
@@ -129 +129 @@
                         "__cor",
                         "get_coroutine",
-                        "coroutine keyword requires coroutines to be in scope, add #include <coroutine>",
+                        "coroutine keyword requires coroutines to be in scope, add #include <coroutine.hfa>",
                         true,
                         KeywordCastExpr::Coroutine
@@ -161 +161 @@
                         "__mon",
                         "get_monitor",
-                        "monitor keyword requires monitors to be in scope, add #include <monitor>",
+                        "monitor keyword requires monitors to be in scope, add #include <monitor.hfa>",
                         false,
                         KeywordCastExpr::Monitor
@@ -488 +488 @@
                 // Do we have the required headers
                 if( !monitor_decl || !guard_decl || !dtor_guard_decl )
-                        SemanticError( decl, "mutex keyword requires monitors to be in scope, add #include <monitor>\n" );
+                        SemanticError( decl, "mutex keyword requires monitors to be in scope, add #include <monitor.hfa>\n" );
 
                 // Instrument the body
@@ -685 +685 @@
                 if( type && type->get_baseStruct()->is_thread() ) {
                         if( !thread_decl || !thread_ctor_seen ) {
-                                SemanticError( type->get_baseStruct()->location, "thread keyword requires threads to be in scope, add #include <thread>");
+                                SemanticError( type->get_baseStruct()->location, "thread keyword requires threads to be in scope, add #include <thread.hfa>");
                         }