Changeset da7fe39 for src/tests/concurrent/signal/wait.c

Timestamp:

Apr 23, 2018, 12:57:46 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, with_gc

Children:

57acae0

Parents:

ba89e9b7 (diff), c8ad5d9 (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/tests/concurrent/signal/wait.c (modified) (2 diffs)

src/tests/concurrent/signal/wait.c

@@ -10 +10 @@
 #include <stdlib>
 #include <thread>
-
-#include <time.h>
+#include <time>
 
 #ifdef LONG_TEST
@@ -20 +19 @@
 
 #ifndef PREEMPTION_RATE
-#define PREEMPTION_RATE 10_000ul
+#define PREEMPTION_RATE 10`ms
 #endif
 
-unsigned int default_preemption() {
+Duration default_preemption() {
         return PREEMPTION_RATE;
 }