ADE version 0.1.1 (#2)

opencv · Sep 24, 2018 · 676db97 · 676db97
1 parent 0ba3b01
commit 676db97
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/sources/ade/include/ade/typed_metadata.hpp b/sources/ade/include/ade/typed_metadata.hpp
@@ -77,7 +77,7 @@ class Metadata final
 
  MetadataHolder& operator=(const MetadataHolder&) = delete;
 
- virtual MetadataHolderPtr clone() const
+ virtual MetadataHolderPtr clone() const override
  {
  return MetadataHolderPtr(new MetadataHolder<T>(*this));
  }

diff --git a/sources/ade/source/alloc.cpp b/sources/ade/source/alloc.cpp
@@ -6,7 +6,12 @@
 
 #include "ade/memory/alloc.hpp"
 
+#ifdef WIN32
 #include <malloc.h>
+#else
+#include <algorithm>
+#include <stdlib.h>
+#endif
 
 #include "ade/util/math.hpp"
 #include "ade/util/assert.hpp"
@@ -20,7 +25,10 @@ void* aligned_alloc(std::size_t size, std::size_t alignment)
 #ifdef WIN32
  return _aligned_malloc(size, alignment);
 #else
- return memalign(alignment, size);
+ void* ret = nullptr;
+ auto res = posix_memalign(&ret, std::max(sizeof(void*), alignment), size);
+ (void)res;
+ return ret;
 #endif
 }