Changeset 9236060 for src/libcfa/concurrency/thread

Timestamp:

Aug 14, 2017, 2:03:39 PM (7 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:

74b007ba

Parents:

fd344aa (diff), 54cd58b (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' into references

File:

• src/libcfa/concurrency/thread (modified) (4 diffs)

src/libcfa/concurrency/thread

@@ -1 @@
-//                              -*- Mode: CFA -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -10 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Tue Jan 17 12:27:26 2017
-// Last Modified By : Thierry Delisle
-// Last Modified On : --
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:59:40 2017
+// Update Count     : 3
 //
 
-#ifndef THREADS_H
-#define THREADS_H
+#pragma once
 
-#include "assert"
+#include <assert.h>
 #include "invoke.h"
 
@@ -54 +52 @@
 }
 
-extern volatile thread_local thread_desc * this_thread;
+extern thread_local thread_desc * volatile this_thread;
 
 forall( dtype T | is_thread(T) )
@@ -84 +82 @@
 void yield( unsigned times );
 
-#endif //THREADS_H
-
 // Local Variables: //
 // mode: c //