add extern C

Author: vidsinghal

benchrunner/cxx/benchmarks.h

@@ -29,9 +29,11 @@ void *cilksort_par(void *const pbase, size_t total_elems, size_t size, __compar_
 template <typename T> T *bottomUpMergeSort(T *a, T *b, int n);
 
 // Relating to C++ templatized versions
-int64_t *bottom_up_merge_sort_cxx_int(int64_t *pbase, size_t total_elems);
-int64_t *insertionsort_cxx_int(int64_t *pbase, size_t total_elems);
-int64_t *quicksort_cxx_int(int64_t *pbase, size_t total_elems);
+extern "C" {
+extern int64_t *bottom_up_merge_sort_cxx_int(int64_t *pbase, size_t total_elems);
+extern int64_t *insertionsort_cxx_int(int64_t *pbase, size_t total_elems);
+extern int64_t *quicksort_cxx_int(int64_t *pbase, size_t total_elems);
+}
 
 // Microbenchmarks.
 int64_t* __attribute__ ((noinline)) fill_array_seq(size_t total_elems, int64_t val);

benchrunner/cxx/insertionsort_int_wrapper.cpp

@@ -2,8 +2,8 @@
 #include "insertionsort.cpp"
 
 
-int64_t *insertionsort_cxx_int(int64_t *pbase, size_t total_elems);
-
-int64_t *insertionsort_cxx_int(int64_t *pbase, size_t total_elems){
+extern "C" {
+extern int64_t *insertionsort_cxx_int(int64_t *pbase, size_t total_elems){
     return insertionsort_inplace<int64_t>(pbase, total_elems);
 }
+}

benchrunner/cxx/mergesort_int_wrapper.cpp

@@ -2,9 +2,12 @@
 #include "mergesort.cpp"
 
 
-int64_t *bottom_up_merge_sort_cxx_int(int64_t *pbase, size_t total_elems){
+extern "C" {
+
+extern int64_t *bottom_up_merge_sort_cxx_int(int64_t *pbase, size_t total_elems){
 
     int64_t *copy_pbase = new int64_t[total_elems];
     copyArray<int64_t>(pbase, copy_pbase, total_elems);
     return bottomUpMergeSort<int64_t>(pbase, copy_pbase, total_elems);
 }
+}

benchrunner/cxx/quicksort_int_wrapper.cpp

@@ -1,6 +1,9 @@
 #include "benchmarks.h"
 #include "quicksort.cpp"
 
-int64_t *quicksort_cxx_int(int64_t *pbase, size_t total_elems){
+extern "C" {
+
+extern int64_t *quicksort_cxx_int(int64_t *pbase, size_t total_elems){
     return quicksort_inplace<int64_t>(pbase, total_elems);
 }
+}