Changeset 45c43e5 for src/libcfa/concurrency/thread.c

Timestamp:

Feb 26, 2018, 12:49:55 PM (8 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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

eddb399

Parents:

17fc7a5 (diff), 2c39855 (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/libcfa/concurrency/thread.c (modified) (1 diff)

src/libcfa/concurrency/thread.c

@@ -98 +98 @@
 
 void yield( void ) {
-        verify( preemption.enabled );
+        verify( preemption_state.enabled );
         BlockInternal( this_thread );
-        verify( preemption.enabled );
+        verify( preemption_state.enabled );
 }