From 6da6a45d09ac8d7ea956c09ba241c9e0840ecb25 Mon Sep 17 00:00:00 2001 From: Jim Flynn Date: Tue, 14 Jul 2020 14:26:27 +0100 Subject: 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 Signed-off-by: Jim Flynn --- src/armnnUtils/Processes.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/armnnUtils/Processes.cpp') 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 #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(); -- cgit v1.2.1