diff options
author | Rob Hughes <robert.hughes@arm.com> | 2019-08-23 10:11:58 +0100 |
---|---|---|
committer | Rob Hughes <robert.hughes@arm.com> | 2019-08-23 09:16:16 +0000 |
commit | 91e1d89ad35ad081a4d5995d541791fbefdb3060 (patch) | |
tree | 57022df335b5ccd38aa697394f97d12e6bfd3db5 /src/backends/reference/RefMemoryManager.cpp | |
parent | 1cd451cdd818e7df83cf60935abc54345fbc40e6 (diff) | |
download | armnn-91e1d89ad35ad081a4d5995d541791fbefdb3060.tar.gz |
Fix Windows build:
* CMake "install" commands require a RUNTIME argument for platforms with
DLLs (e.g. Windows).
* Replace use of non-standard variable length array with vector
* Remove unnecessary #include of unistd.h
* Add #ifdefs to dynamic backend code to disable for non-Unix platforms
where you can't use dlopen etc. We could implement this properly for Windows
later using LoadLibrary etc., but for now erroring is fine.
* Add missing #include of <algorithm>
Change-Id: Ic8ef5fd599b37bf8772510157b6e479819f6a1eb
Diffstat (limited to 'src/backends/reference/RefMemoryManager.cpp')
-rw-r--r-- | src/backends/reference/RefMemoryManager.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/backends/reference/RefMemoryManager.cpp b/src/backends/reference/RefMemoryManager.cpp index 0f4a289807..fdd008dbe6 100644 --- a/src/backends/reference/RefMemoryManager.cpp +++ b/src/backends/reference/RefMemoryManager.cpp @@ -6,6 +6,8 @@ #include <boost/assert.hpp> +#include <algorithm> + namespace armnn { @@ -73,7 +75,7 @@ RefMemoryManager::Pool::~Pool() void* RefMemoryManager::Pool::GetPointer() { - BOOST_ASSERT_MSG(m_Pointer, "RefMemoryManager::Pool::GetPointer() called when memory not acquired"); + BOOST_ASSERT_MSG(m_Pointer, "RefMemoryManager::Pool::GetPointer() called when memory not acquired"); return m_Pointer; } @@ -85,14 +87,14 @@ void RefMemoryManager::Pool::Reserve(unsigned int numBytes) void RefMemoryManager::Pool::Acquire() { - BOOST_ASSERT_MSG(!m_Pointer, "RefMemoryManager::Pool::Acquire() called when memory already acquired"); + BOOST_ASSERT_MSG(!m_Pointer, "RefMemoryManager::Pool::Acquire() called when memory already acquired"); BOOST_ASSERT(m_Size >= 0); m_Pointer = ::operator new(size_t(m_Size)); } void RefMemoryManager::Pool::Release() { - BOOST_ASSERT_MSG(m_Pointer, "RefMemoryManager::Pool::Release() called when memory not acquired"); + BOOST_ASSERT_MSG(m_Pointer, "RefMemoryManager::Pool::Release() called when memory not acquired"); ::operator delete(m_Pointer); m_Pointer = nullptr; } |