Changeset 777ed2b for src/Concurrency/Keywords.cc

Timestamp:

Jul 11, 2018, 11:55:59 AM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

0fc52b6

Parents:

fc20514 (diff), 7de22b28 (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:

fix conflicts

File:

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

src/Concurrency/Keywords.cc

@@ -501 +501 @@
         void MutexKeyword::postvisit(StructDecl* decl) {
 
-                if( decl->name == "monitor_desc" ) {
+                if( decl->name == "monitor_desc" && decl->body ) {
                         assert( !monitor_decl );
                         monitor_decl = decl;
                 }
-                else if( decl->name == "monitor_guard_t" ) {
+                else if( decl->name == "monitor_guard_t" && decl->body ) {
                         assert( !guard_decl );
                         guard_decl = decl;
                 }
-                else if( decl->name == "monitor_dtor_guard_t" ) {
+                else if( decl->name == "monitor_dtor_guard_t" && decl->body ) {
                         assert( !dtor_guard_decl );
                         dtor_guard_decl = decl;