diff options
| author | Jim Flynn <jim.flynn@arm.com> | 2020-07-20 16:57:44 +0100 |
|---|---|---|
| committer | Jim Flynn <jim.flynn@arm.com> | 2020-07-29 15:35:15 +0100 |
| commit | bbfe603e5ae42317a2b67d713d00882bea341c88 (patch) | |
| tree | 8d8a78d6836384fb92fb9741c865443624dfec68 /src/armnnUtils | |
| parent | a9c2ce123a6a5a68728d040a0323c482bbe46903 (diff) | |
| download | armnn-bbfe603e5ae42317a2b67d713d00882bea341c88.tar.gz | |
IVGCVSW-5166 Pull out the common and server side code into standalone libraries
Change-Id: I180f84c493a9b2be4b93b25d312ebdd9e71b1735
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src/armnnUtils')
| -rw-r--r-- | src/armnnUtils/Processes.cpp | 2 | ||||
| -rw-r--r-- | src/armnnUtils/Threads.cpp | 2 | ||||
| -rw-r--r-- | src/armnnUtils/WindowsWrapper.hpp | 17 |
3 files changed, 2 insertions, 19 deletions
diff --git a/src/armnnUtils/Processes.cpp b/src/armnnUtils/Processes.cpp index 41b035b887..eb68dd9dff 100644 --- a/src/armnnUtils/Processes.cpp +++ b/src/armnnUtils/Processes.cpp @@ -8,7 +8,7 @@ #if defined(__unix__) || defined(__APPLE__) #include <unistd.h> #elif defined(_MSC_VER) -#include "WindowsWrapper.hpp" +#include <commons/include/WindowsWrapper.hpp> #endif namespace armnnUtils diff --git a/src/armnnUtils/Threads.cpp b/src/armnnUtils/Threads.cpp index 0ca1adf0c3..3ee8174d01 100644 --- a/src/armnnUtils/Threads.cpp +++ b/src/armnnUtils/Threads.cpp @@ -10,7 +10,7 @@ #include <sys/syscall.h> #define gettid() syscall(SYS_gettid) #elif defined(_MSC_VER) -#include "WindowsWrapper.hpp" +#include <commons/include/WindowsWrapper.hpp> #elif defined(__APPLE__) #include "AvailabilityMacros.h" #include <sys/syscall.h> diff --git a/src/armnnUtils/WindowsWrapper.hpp b/src/armnnUtils/WindowsWrapper.hpp deleted file mode 100644 index 7f02cb1a16..0000000000 --- a/src/armnnUtils/WindowsWrapper.hpp +++ /dev/null @@ -1,17 +0,0 @@ -// -// Copyright © 2020 Arm Ltd. All rights reserved. -// SPDX-License-Identifier: MIT -// - -// This header brings in the Win32 API header, with some small modifications applied to prevent clashes with our code. - -#if defined(_MSC_VER) - -#define NOMINMAX // Prevent definition of min/max macros that interfere with std::min/max -#define WIN32_LEAN_AND_MEAN -#include <Windows.h> -// Windows.h defines some names that we don't need and interfere with some of our definition -#undef TIME_MS // Instrument.hpp -#undef CreateEvent // ITimelineDecoder.hpp - -#endif |