From 313e1c883f655d87e1709091f5812846f04c9af1 Mon Sep 17 00:00:00 2001
From: Matthew Bentham <matthew.bentham@arm.com>
Date: Mon, 25 Mar 2019 17:37:47 +0000
Subject: IVGCVSW-2882 Fix include order in armnn public headers

Change-Id: I111eab934824348f5e9c1d1384be5a24546dc19a
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
---
 include/armnn/ArmNN.hpp         | 2 +-
 include/armnn/BackendId.hpp     | 4 ++--
 include/armnn/Exceptions.hpp    | 2 +-
 include/armnn/ILayerSupport.hpp | 3 ++-
 include/armnn/ILayerVisitor.hpp | 4 ++--
 include/armnn/INetwork.hpp      | 7 +++----
 include/armnn/IRuntime.hpp      | 7 ++++---
 include/armnn/LayerSupport.hpp  | 4 ++--
 include/armnn/Optional.hpp      | 3 ++-
 include/armnn/Tensor.hpp        | 2 +-
 include/armnn/Types.hpp         | 6 ++++--
 include/armnn/TypesUtils.hpp    | 8 +++++---
 include/armnn/Utils.hpp         | 3 ++-
 13 files changed, 31 insertions(+), 24 deletions(-)

(limited to 'include')

diff --git a/include/armnn/ArmNN.hpp b/include/armnn/ArmNN.hpp
index f03b79d1ca..de5ea3e1c1 100644
--- a/include/armnn/ArmNN.hpp
+++ b/include/armnn/ArmNN.hpp
@@ -7,8 +7,8 @@
 #include "BackendId.hpp"
 #include "Descriptors.hpp"
 #include "Exceptions.hpp"
-#include "IRuntime.hpp"
 #include "INetwork.hpp"
+#include "IRuntime.hpp"
 #include "LayerSupport.hpp"
 #include "LstmParams.hpp"
 #include "Optional.hpp"
diff --git a/include/armnn/BackendId.hpp b/include/armnn/BackendId.hpp
index 89725c165a..7dd1460bc1 100644
--- a/include/armnn/BackendId.hpp
+++ b/include/armnn/BackendId.hpp
@@ -4,11 +4,11 @@
 //
 #pragma once
 
+#include <memory>
 #include <ostream>
 #include <set>
-#include <unordered_set>
 #include <string>
-#include <memory>
+#include <unordered_set>
 #include <vector>
 
 namespace armnn
diff --git a/include/armnn/Exceptions.hpp b/include/armnn/Exceptions.hpp
index 008617d457..1740a8c47d 100644
--- a/include/armnn/Exceptions.hpp
+++ b/include/armnn/Exceptions.hpp
@@ -4,9 +4,9 @@
 //
 #pragma once
 
+#include <sstream>
 #include <stdexcept>
 #include <string>
-#include <sstream>
 
 namespace armnn
 {
diff --git a/include/armnn/ILayerSupport.hpp b/include/armnn/ILayerSupport.hpp
index b5f9e6ac6c..8a08146a7d 100644
--- a/include/armnn/ILayerSupport.hpp
+++ b/include/armnn/ILayerSupport.hpp
@@ -6,9 +6,10 @@
 
 #include <armnn/DescriptorsFwd.hpp>
 #include <armnn/Optional.hpp>
-#include <vector>
+
 #include <cctype>
 #include <memory>
+#include <vector>
 
 namespace armnn
 {
diff --git a/include/armnn/ILayerVisitor.hpp b/include/armnn/ILayerVisitor.hpp
index c0350d253a..ce09246d07 100644
--- a/include/armnn/ILayerVisitor.hpp
+++ b/include/armnn/ILayerVisitor.hpp
@@ -4,8 +4,8 @@
 //
 #pragma once
 
-#include <armnn/NetworkFwd.hpp>
 #include <armnn/DescriptorsFwd.hpp>
+#include <armnn/NetworkFwd.hpp>
 #include <armnn/Optional.hpp>
 #include <armnn/TensorFwd.hpp>
 #include <armnn/Types.hpp>
@@ -321,4 +321,4 @@ public:
                                   const char* name = nullptr) = 0;
 
 };
-} // namespace armnn
\ No newline at end of file
+} // namespace armnn
diff --git a/include/armnn/INetwork.hpp b/include/armnn/INetwork.hpp
index a4dd0da25d..b61206fae1 100644
--- a/include/armnn/INetwork.hpp
+++ b/include/armnn/INetwork.hpp
@@ -4,12 +4,11 @@
 //
 #pragma once
 
-#include <armnn/NetworkFwd.hpp>
 #include <armnn/DescriptorsFwd.hpp>
-#include <armnn/TensorFwd.hpp>
-#include <armnn/Optional.hpp>
 #include <armnn/ILayerVisitor.hpp>
-
+#include <armnn/NetworkFwd.hpp>
+#include <armnn/Optional.hpp>
+#include <armnn/TensorFwd.hpp>
 #include <armnn/Types.hpp>
 
 #include <memory>
diff --git a/include/armnn/IRuntime.hpp b/include/armnn/IRuntime.hpp
index 44864ce86d..34487d5b76 100644
--- a/include/armnn/IRuntime.hpp
+++ b/include/armnn/IRuntime.hpp
@@ -4,14 +4,15 @@
 //
 #pragma once
 
-#include <memory>
 
-#include "Types.hpp"
-#include "Tensor.hpp"
 #include "INetwork.hpp"
 #include "IProfiler.hpp"
+#include "Tensor.hpp"
+#include "Types.hpp"
 #include "TypesUtils.hpp"
 
+#include <memory>
+
 namespace armnn
 {
 
diff --git a/include/armnn/LayerSupport.hpp b/include/armnn/LayerSupport.hpp
index b95b961e20..442230687d 100644
--- a/include/armnn/LayerSupport.hpp
+++ b/include/armnn/LayerSupport.hpp
@@ -5,9 +5,9 @@
 #pragma once
 
 #include <armnn/DescriptorsFwd.hpp>
-#include <armnn/Types.hpp>
-#include <armnn/Tensor.hpp>
 #include <armnn/Optional.hpp>
+#include <armnn/Tensor.hpp>
+#include <armnn/Types.hpp>
 
 namespace armnn
 {
diff --git a/include/armnn/Optional.hpp b/include/armnn/Optional.hpp
index 116466d013..29be3829a7 100644
--- a/include/armnn/Optional.hpp
+++ b/include/armnn/Optional.hpp
@@ -5,8 +5,9 @@
 #pragma once
 
 #include "Exceptions.hpp"
-#include <type_traits>
+
 #include <cstring>
+#include <type_traits>
 
 // Optional is a drop in replacement for std::optional until we migrate
 // to c++-17. Only a subset of the optional features are implemented that
diff --git a/include/armnn/Tensor.hpp b/include/armnn/Tensor.hpp
index 589d849fa8..503c161570 100644
--- a/include/armnn/Tensor.hpp
+++ b/include/armnn/Tensor.hpp
@@ -5,8 +5,8 @@
 #pragma once
 #include "TensorFwd.hpp"
 
-#include "Types.hpp"
 #include "Exceptions.hpp"
+#include "Types.hpp"
 
 #include <array>
 #include <initializer_list>
diff --git a/include/armnn/Types.hpp b/include/armnn/Types.hpp
index bdddd37a1c..32e2a6febc 100644
--- a/include/armnn/Types.hpp
+++ b/include/armnn/Types.hpp
@@ -4,11 +4,13 @@
 //
 #pragma once
 
+
+#include "BackendId.hpp"
+#include "Exceptions.hpp"
+
 #include <array>
 #include <functional>
 #include <memory>
-#include "BackendId.hpp"
-#include "Exceptions.hpp"
 
 namespace armnn
 {
diff --git a/include/armnn/TypesUtils.hpp b/include/armnn/TypesUtils.hpp
index b5fb95d9ba..4880c90538 100644
--- a/include/armnn/TypesUtils.hpp
+++ b/include/armnn/TypesUtils.hpp
@@ -4,12 +4,14 @@
 //
 #pragma once
 
-#include "Types.hpp"
 #include "Tensor.hpp"
-#include <cmath>
-#include <ostream>
+#include "Types.hpp"
+
 #include <boost/assert.hpp>
 #include <boost/numeric/conversion/cast.hpp>
+
+#include <cmath>
+#include <ostream>
 #include <set>
 
 namespace armnn
diff --git a/include/armnn/Utils.hpp b/include/armnn/Utils.hpp
index 8d072300da..d91cc79fc9 100644
--- a/include/armnn/Utils.hpp
+++ b/include/armnn/Utils.hpp
@@ -4,9 +4,10 @@
 //
 #pragma once
 
-#include <vector>
 #include "armnn/TypesUtils.hpp"
 
+#include <vector>
+
 namespace armnn
 {
 
-- 
cgit v1.2.1