Merge pull request #38 from thirdwing/master

compile on Mac OSX
apache · Sep 5, 2015 · 3c769f1 · 3c769f1
2 parents a5a54e2 + a83b6ac
commit 3c769f1
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/storage/cpu_device_storage.h b/src/storage/cpu_device_storage.h
@@ -38,7 +38,13 @@ class CPUDeviceStorage {
 };  // class CPUDeviceStorage
 
 inline void* CPUDeviceStorage::Alloc(size_t size) {
+#ifdef __APPLE__
+  return CHECK_NOTNULL(malloc(size));
+#elif _MSC_VER
+  return CHECK_NOTNULL(_aligned_malloc(size, alignment_));
+#else
   return CHECK_NOTNULL(memalign(alignment_, size));
+#endif
 }
 
 inline void CPUDeviceStorage::Free(void* ptr) { free(ptr); }