diff options
| author | Jim Flynn <jim.flynn@arm.com> | 2020-07-14 14:26:27 +0100 |
|---|---|---|
| committer | Jim Flynn <jim.flynn@arm.com> | 2020-07-14 16:12:12 +0000 |
| commit | 6da6a45d09ac8d7ea956c09ba241c9e0840ecb25 (patch) | |
| tree | 0b3a85aef2b5d03e036c60e344188ae1c5057849 /src/backends/backendsCommon | |
| parent | bac9b35df7c59f6b5b61e1d233a49bdb88a973ba (diff) | |
| download | armnn-6da6a45d09ac8d7ea956c09ba241c9e0840ecb25.tar.gz | |
Make it build on MACOSX
Still need to explicitly defined
-DCMAKE_CXX_FLAGS=--std=c++14
which that flags should goes into CMakefile.txt
JF: Fixed merge failure by removing Filesystem.cpp
and updated the copyright headers to new standard
Change-Id: I6d0886bd86bc1ddb593028194852551d43c77745
Signed-off-by: Keith Mok <ek9852@gmail.com>
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src/backends/backendsCommon')
| -rw-r--r-- | src/backends/backendsCommon/DynamicBackendUtils.cpp | 8 | ||||
| -rw-r--r-- | src/backends/backendsCommon/DynamicBackendUtils.hpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/backends/backendsCommon/DynamicBackendUtils.cpp b/src/backends/backendsCommon/DynamicBackendUtils.cpp index 1abea114bd..46b5a52719 100644 --- a/src/backends/backendsCommon/DynamicBackendUtils.cpp +++ b/src/backends/backendsCommon/DynamicBackendUtils.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -15,7 +15,7 @@ namespace armnn void* DynamicBackendUtils::OpenHandle(const std::string& sharedObjectPath) { -#if defined(__unix__) +#if defined(__unix__) || defined(__APPLE__) if (sharedObjectPath.empty()) { throw RuntimeException("OpenHandle error: shared object path must not be empty"); @@ -35,7 +35,7 @@ void* DynamicBackendUtils::OpenHandle(const std::string& sharedObjectPath) void DynamicBackendUtils::CloseHandle(const void* sharedObjectHandle) { -#if defined(__unix__) +#if defined(__unix__) || defined(__APPLE__) if (!sharedObjectHandle) { return; @@ -63,7 +63,7 @@ bool DynamicBackendUtils::IsBackendCompatibleImpl(const BackendVersion &backendA std::string DynamicBackendUtils::GetDlError() { -#if defined(__unix__) +#if defined(__unix__) || defined(__APPLE__) const char* errorMessage = dlerror(); if (!errorMessage) { diff --git a/src/backends/backendsCommon/DynamicBackendUtils.hpp b/src/backends/backendsCommon/DynamicBackendUtils.hpp index f4cdd4db0c..63ee611cae 100644 --- a/src/backends/backendsCommon/DynamicBackendUtils.hpp +++ b/src/backends/backendsCommon/DynamicBackendUtils.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -14,7 +14,7 @@ #include <string> #include <vector> -#if defined(__unix__) +#if defined(__unix__) || defined(__APPLE__) #include <dlfcn.h> #endif @@ -61,7 +61,7 @@ private: template<typename EntryPointType> EntryPointType DynamicBackendUtils::GetEntryPoint(const void* sharedObjectHandle, const char* symbolName) { -#if defined(__unix__) +#if defined(__unix__) || defined(__APPLE__) if (sharedObjectHandle == nullptr) { throw RuntimeException("GetEntryPoint error: invalid handle"); |