IVGCVSW-2882 Fix include order in armnn public headers
Change-Id: I111eab934824348f5e9c1d1384be5a24546dc19a
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
diff --git a/include/armnn/ArmNN.hpp b/include/armnn/ArmNN.hpp
index f03b79d..de5ea3e 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 89725c1..7dd1460 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 008617d..1740a8c 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 b5f9e6a..8a08146 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 c0350d2..ce09246 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 @@
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 a4dd0da..b61206f 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 44864ce..34487d5 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 b95b961..4422306 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 116466d..29be382 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 589d849..503c161 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 bdddd37..32e2a6f 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 b5fb95d..4880c90 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 8d07230..d91cc79 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
{