Changeset 7c70089 for src/Concurrency

Timestamp:

Mar 17, 2017, 1:36:27 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

31ce3d6

Parents:

b32ada31 (diff), 946bcca (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/Keywords.cc (modified) (3 diffs)

src/Concurrency/Keywords.cc

@@ -12 +12 @@
 // Last Modified By :
 // Last Modified On :
-// Update Count     : 1
+// Update Count     : 3
 //
 
@@ -264 +264 @@
                         //Find mutex arguments
                         Type* ty = arg->get_type();
-                        if( ! ty->get_qualifiers().isMutex ) continue;
+                        if( ! ty->get_mutex() ) continue;
 
                         //Append it to the list
@@ -285 +285 @@
 
                 //Make sure that typed isn't mutex
-                if( base->get_qualifiers().isMutex ) throw SemanticError( "mutex keyword may only appear once per argument ", arg );
+                if( ! base->get_mutex() ) throw SemanticError( "mutex keyword may only appear once per argument ", arg );
         }