Changeset d3a85240 for src/libcfa/concurrency/threads

Timestamp:

Jan 11, 2017, 3:30:10 PM (9 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:

2162c2c, 2298a7b8

Parents:

dd0c97b (diff), 17e5e2b (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/threads (modified) (2 diffs)

src/libcfa/concurrency/threads

@@ -15 +15 @@
 //
 
-#ifndef __THREADS_H__
-#define __THREADS_H__
+#ifdef __CFORALL__
+
+#ifndef THREADS_H
+#define THREADS_H
 
 #include "assert"       //
@@ -111 +113 @@
 }
 
-#endif //__THREADS_H__
+#endif //THREADS_H
+
+#else
+#include_next <thread>
+#endif //__CFORALL__
 
 // Local Variables: //