commit bc873d2dac4666a86e4844985199dfd90e67be5b
author Rob Hughes <robert.hughes@arm.com> Wed May 20 13:11:37 2020 +0100
committer Rob Hughes <robert.hughes@arm.com> Tue Jun 02 14:55:00 2020 +0000
tree 478688dc9a28b497a13ce7b65ef786d1d8b4547b
parent bb46dde88befe14583eaac83f65775a7543d4586

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>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88e813a..8f8060a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,6 +73,7 @@
     src/armnnUtils/TensorIOUtils.hpp
     src/armnnUtils/TensorUtils.cpp
     src/armnnUtils/Transpose.cpp
+    src/armnnUtils/WindowsWrapper.hpp
     )
 
 add_library_ex(armnnUtils STATIC ${armnnUtils_sources})
@@ -255,6 +256,7 @@
     profiling/common/include/ProfilingException.hpp
     profiling/common/include/SocketConnectionException.hpp
     profiling/common/include/Constants.hpp
+    profiling/common/include/NetworkSockets.hpp
     profiling/common/src/NetworkSockets.cpp
     src/armnn/layers/LayerCloneBase.hpp
     src/armnn/layers/LayerWithParameters.hpp
@@ -1076,6 +1078,7 @@
 
     target_include_directories(GatordMock PRIVATE profiling/common/include
                                                   profiling/server/src/basePipeServer
+                                                  src/armnnUtils
                                                   src/profiling
                                                   src/timelineDecoder)