Changeset 534d84e for src/tests/concurrent/thread.c

Timestamp:

Apr 28, 2018, 10:35:51 AM (6 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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

b6dc097

Parents:

9997fee (diff), a0c7d5cc (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 plg2:software/cfa/cfa-cc

File:

• src/tests/concurrent/thread.c (modified) (1 diff)

src/tests/concurrent/thread.c

@@ -7 +7 @@
 thread Second { semaphore* lock; };
 
-void ?{}( First & this, semaphore & lock ) { this.lock = &lock; }
-void ?{}( Second & this, semaphore & lock ) { this.lock = &lock; }
+void ?{}( First  & this, semaphore & lock ) { ((thread&)this){"Thread 1"}; this.lock = &lock; }
+void ?{}( Second & this, semaphore & lock ) { ((thread&)this){"Thread 2"}; this.lock = &lock; }
 
 void main(First& this) {