diff options
| author | Rob Hughes <robert.hughes@arm.com> | 2020-05-20 13:11:37 +0100 |
|---|---|---|
| committer | Rob Hughes <robert.hughes@arm.com> | 2020-06-02 14:55:00 +0000 |
| commit | bc873d2dac4666a86e4844985199dfd90e67be5b (patch) | |
| tree | 478688dc9a28b497a13ce7b65ef786d1d8b4547b /src/armnn/Logging.cpp | |
| parent | bb46dde88befe14583eaac83f65775a7543d4586 (diff) | |
| download | armnn-bc873d2dac4666a86e4844985199dfd90e67be5b.tar.gz | |
Tidy up uses of Windows.h by adding WindowsWrapper.hpp
This header brings in the Win32 API header, with some small modifications
applied to prevent clashes with our code. This means those modifications
don't need to be made in each place that we bring in Windows.h
Change-Id: Ie817c7a167eccbe1ac6a49d3fc940eef8b2f534d
Signed-off-by: Robert Hughes <robert.hughes@arm.com>
Diffstat (limited to 'src/armnn/Logging.cpp')
| -rw-r--r-- | src/armnn/Logging.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/armnn/Logging.cpp b/src/armnn/Logging.cpp index a3ca7ce118..6db4afaf49 100644 --- a/src/armnn/Logging.cpp +++ b/src/armnn/Logging.cpp @@ -9,11 +9,7 @@ #include <armnn/utility/Assert.hpp> #if defined(_MSC_VER) -#ifndef NOMINMAX -#define NOMINMAX // Prevent definition of min/max macros that interfere with std::min/max -#endif -#include <Windows.h> -#undef TIME_MS // Windows.h defines this but we don't need it and it interferes with our definition in Instrument.hpp +#include <WindowsWrapper.hpp> #endif #if defined(__ANDROID__) |