Changes in src/benchmark/bench.h [8ad6533:9d32bc8]

File:

• src/benchmark/bench.h (modified) (2 diffs)

src/benchmark/bench.h

@@ -6 +6 @@
         #include <stdlib.h>
         #include <unistd.h>                                     // sysconf
-        #include <sys/times.h>                                  // times
+#if ! defined(__cforall)
         #include <time.h>
-#if defined(__cforall)
+        #include <sys/time.h>
+#else
 }
-//#include <bits/cfatime.h>
+#include <time>
 #endif
 
 
-static inline unsigned long long int Time() {
+static inline unsigned long long int bench_time() {
     struct timespec ts;
     clock_gettime(
@@ -41 +42 @@
         }                                               \
         long long int StartTime, EndTime;       \
-        StartTime = Time();                     \
+        StartTime = bench_time();               \
         statement;                                      \
-        EndTime = Time();                               \
+        EndTime = bench_time();                 \
         unsigned long long int output =         \
         ( EndTime - StartTime ) / n;
 
-__cfa_time_t default_preemption() {
+#if defined(__cforall)
+Duration default_preemption() {
         return 0;
 }
+#endif