fix malloc?

pcmoritz · pcmoritz · commit 63729130d0f8 · 2017-06-11T14:01:39.000-07:00
diff --git a/cpp/src/plasma/CMakeLists.txt b/cpp/src/plasma/CMakeLists.txt
@@ -78,6 +78,8 @@ add_library(plasma_lib STATIC
 target_link_libraries(plasma_lib ${FLATBUFFERS_STATIC_LIB} -lpthread)
 add_dependencies(plasma_lib gen_plasma_fbs)
 
+set_source_files_properties(malloc.cc PROPERTIES COMPILE_FLAGS "-Wno-error=conversion")
+
 add_executable(plasma_store
   plasma_store.cc
   thirdparty/ae/ae.c
diff --git a/cpp/src/plasma/malloc.cc b/cpp/src/plasma/malloc.cc
@@ -12,7 +12,7 @@
 
 extern "C" {
 void *fake_mmap(size_t);
-int fake_munmap(void *, size_t);
+int fake_munmap(void *, int64_t);
 
 #define MMAP(s) fake_mmap(s)
 #define MUNMAP(a, s) fake_munmap(a, s)
@@ -126,7 +126,7 @@ void *fake_mmap(size_t size) {
   return pointer;
 }
 
-int fake_munmap(void *addr, size_t size) {
+int fake_munmap(void *addr, int64_t size) {
   ARROW_LOG(DEBUG) << "fake_munmap(" << addr << ", " << size << ")";
   addr = pointer_retreat(addr, sizeof(size_t));
   size += sizeof(size_t);
