Convert test cases from C to C++

7 files changed, 8 insertions, 9 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f68084c..80b0234 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,19 +19,17 @@ add_definitions(${GTK2_CFLAGS_OTHER})
 find_package(Cairo)
 #include_directories(BEFORE ${CAIRO_INCLUDE_DIRS})
 
-add_definitions(-std=c99)
-
-add_executable(fill src/fill.c)
+add_executable(fill src/fill.cpp)
 target_link_libraries(fill cairo)
 
-add_executable(image src/image.c)
+add_executable(image src/image.cpp)
 target_link_libraries(image cairo)
 
-add_executable(mask src/mask.c)
+add_executable(mask src/mask.cpp)
 target_link_libraries(mask cairo)
 
-add_executable(paint src/paint.c)
+add_executable(paint src/paint.cpp)
 target_link_libraries(paint cairo)
 
-add_executable(stroke src/stroke.c)
+add_executable(stroke src/stroke.cpp)
 target_link_libraries(stroke ${CAIRO_LIBRARIES} GL ${GTK2_LIBRARIES} ${X11_LIBRARIES})
diff --git a/src/caskbench.c b/src/caskbench.cpp
index 6c4f91f..2045b61 100644
--- a/src/caskbench.c
+++ b/src/caskbench.cpp
@@ -13,7 +13,7 @@ cb_get_tick (void)
 {
   struct timeval now;
   gettimeofday (&now, NULL);
-  return now.tv_sec + now.tv_usec / 1000000.0;
+  return (double)now.tv_sec + (double)now.tv_usec / 1000000.0;
 }
 
 void
@@ -34,7 +34,7 @@ main (int argc, char *argv[])
 {
   int c, i;
   int num_iterations = 10;
-  double start_time, stop_time;
+  double start_time, stop_time, run_sec;
 
   parse_options (&perf, argc, argv);
 
@@ -52,6 +52,7 @@ main (int argc, char *argv[])
       // Mark as crashed
     }
     stop_time = cb_get_tick();
+    run_sec = stop_time - start_time;
     // TODO: Print test summary to stdout
     // TODO: Write json
   }
diff --git a/src/fill.c b/src/fill.cpp
index 8996a56..8996a56 100644
--- a/src/fill.c
+++ b/src/fill.cpp
diff --git a/src/image.c b/src/image.cpp
index 35e9cca..35e9cca 100644
--- a/src/image.c
+++ b/src/image.cpp
diff --git a/src/mask.c b/src/mask.cpp
index b1906ac..b1906ac 100644
--- a/src/mask.c
+++ b/src/mask.cpp
diff --git a/src/paint.c b/src/paint.cpp
index d7d09f1..d7d09f1 100644
--- a/src/paint.c
+++ b/src/paint.cpp
diff --git a/src/stroke.c b/src/stroke.cpp
index 2959125..2959125 100644
--- a/src/stroke.c
+++ b/src/stroke.cpp