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/armnnUtils | |
| 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/armnnUtils')
| -rw-r--r-- | src/armnnUtils/Filesystem.cpp | 2 | ||||
| -rw-r--r-- | src/armnnUtils/Filesystem.hpp | 2 | ||||
| -rw-r--r-- | src/armnnUtils/Processes.cpp | 6 | ||||
| -rw-r--r-- | src/armnnUtils/Processes.hpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/armnnUtils/Filesystem.cpp b/src/armnnUtils/Filesystem.cpp index ac9a414ae4..59d05239ae 100644 --- a/src/armnnUtils/Filesystem.cpp +++ b/src/armnnUtils/Filesystem.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2020 Arm Ltd. All rights reserved. +// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // diff --git a/src/armnnUtils/Filesystem.hpp b/src/armnnUtils/Filesystem.hpp index 869b0c1b5e..3d93ce610d 100644 --- a/src/armnnUtils/Filesystem.hpp +++ b/src/armnnUtils/Filesystem.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2020 Arm Ltd. All rights reserved. +// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // diff --git a/src/armnnUtils/Processes.cpp b/src/armnnUtils/Processes.cpp index 86593aaf5f..41b035b887 100644 --- a/src/armnnUtils/Processes.cpp +++ b/src/armnnUtils/Processes.cpp @@ -1,11 +1,11 @@ // -// Copyright © 2020 Arm Ltd. All rights reserved. +// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #include "Processes.hpp" -#if defined(__unix__) +#if defined(__unix__) || defined(__APPLE__) #include <unistd.h> #elif defined(_MSC_VER) #include "WindowsWrapper.hpp" @@ -18,7 +18,7 @@ namespace Processes int GetCurrentId() { -#if defined(__unix__) +#if defined(__unix__) || defined(__APPLE__) return getpid(); #elif defined(_MSC_VER) return ::GetCurrentProcessId(); diff --git a/src/armnnUtils/Processes.hpp b/src/armnnUtils/Processes.hpp index 4e5e94b822..89704237db 100644 --- a/src/armnnUtils/Processes.hpp +++ b/src/armnnUtils/Processes.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2020 Arm Ltd. All rights reserved. +// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // |