From 0b06e7426e587d99a179bd17fb2c094b94d3c8e4eca43a8c241b99d3b58755e5 Mon Sep 17 00:00:00 2001
From: Guillaume GARDET <guillaume.gardet@opensuse.org>
Date: Wed, 5 Apr 2023 06:30:22 +0000
Subject: [PATCH] Accepting request 1077421 from
 home:Guillaume_G:branches:science:machinelearning

- Update armnn-fix-gcc13.patch with upstream patch

OBS-URL: https://build.opensuse.org/request/show/1077421
OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/armnn?expand=0&rev=71
---
 armnn-fix-gcc13.patch | 124 +++++++++++++++++++++++++++++-------------
 armnn.changes         |   5 ++
 2 files changed, 91 insertions(+), 38 deletions(-)

diff --git a/armnn-fix-gcc13.patch b/armnn-fix-gcc13.patch
index f98d986..0359647 100644
--- a/armnn-fix-gcc13.patch
+++ b/armnn-fix-gcc13.patch
@@ -1,50 +1,98 @@
---- armnn-23.02/src/armnnUtils/VerificationHelpers.hpp.orig	2023-03-21 11:42:43.586421589 +0100
-+++ armnn-23.02/src/armnnUtils/VerificationHelpers.hpp	2023-03-21 11:42:58.738601283 +0100
-@@ -7,6 +7,7 @@
- #include <sstream>
- 
- #include <armnn/Exceptions.hpp>
-+#include <cstdint>
- 
- namespace armnnUtils
+From 4746ab11be5a8558a54c21142800abaa30efc3a6 Mon Sep 17 00:00:00 2001
+From: Pablo Marquez Tello <pablo.tello@arm.com>
+Date: Fri, 31 Mar 2023 15:57:43 +0100
+Subject: [PATCH] Fix gcc 13 compiler errors
+
+* Resolves MLCE-1040
+
+Change-Id: I32878ed70af356832403e83dcb63b0b89a8a84e3
+Signed-off-by: Pablo Marquez Tello <pablo.tello@arm.com>
+---
+
+diff --git a/include/armnn/utility/TransformIterator.hpp b/include/armnn/utility/TransformIterator.hpp
+index f65ac79..b038447 100644
+--- a/include/armnn/utility/TransformIterator.hpp
++++ b/include/armnn/utility/TransformIterator.hpp
+@@ -1,5 +1,5 @@
+ //
+-// Copyright © 2020 Arm Ltd and Contributors. All rights reserved.
++// Copyright © 2020,2023 Arm Ltd and Contributors. All rights reserved.
+ // SPDX-License-Identifier: MIT
+ //
+ #pragma once
+@@ -18,10 +18,15 @@
+         typename Reference =
+         typename std::result_of<const Function(typename std::iterator_traits<Iterator>::reference)>::type
+ >
+-class TransformIterator : public std::iterator<Category, T, Distance, Pointer, Reference>
++class TransformIterator
  {
---- armnn-23.02/profiling/client/include/CounterIdMap.hpp.orig	2023-03-21 12:03:05.672831589 +0100
-+++ armnn-23.02/profiling/client/include/CounterIdMap.hpp	2023-03-21 12:03:18.292980107 +0100
-@@ -6,6 +6,7 @@
+-
+ public:
++    using iterator_category = Category;
++    using value_type = T;
++    using difference_type = Distance;
++    using pointer = Pointer;
++    using reference = Reference;
++
  
- #include <map>
- #include <string>
-+#include <cstdint>
+     TransformIterator() = default;
+     TransformIterator(TransformIterator const& transformIterator) = default;
+@@ -83,4 +88,4 @@
+     return TransformIterator<Function, Iterator>(i, f);
+ }
  
- namespace arm
- {
---- armnn-23.02/profiling/common/include/Counter.hpp.orig	2023-03-21 13:14:21.926470002 +0100
-+++ armnn-23.02/profiling/common/include/Counter.hpp	2023-03-21 13:14:32.046586851 +0100
-@@ -6,6 +6,7 @@
+-}
+\ No newline at end of file
++}
+diff --git a/profiling/client/include/CounterIdMap.hpp b/profiling/client/include/CounterIdMap.hpp
+index cce7184..45cad7b 100644
+--- a/profiling/client/include/CounterIdMap.hpp
++++ b/profiling/client/include/CounterIdMap.hpp
+@@ -1,9 +1,10 @@
+ //
+-// Copyright © 2020 Arm Ltd. All rights reserved.
++// Copyright © 2020,2023 Arm Ltd and Contributors. All rights reserved.
+ // SPDX-License-Identifier: MIT
+ //
  #pragma once
  
- #include <string>
 +#include <cstdint>
+ #include <map>
+ #include <string>
  
- namespace arm
- {
---- armnn-23.02/profiling/client/src/Holder.cpp.orig	2023-03-21 13:28:41.724376732 +0100
-+++ armnn-23.02/profiling/client/src/Holder.cpp	2023-03-21 13:28:55.772538587 +0100
-@@ -4,6 +4,7 @@
+diff --git a/profiling/common/include/Counter.hpp b/profiling/common/include/Counter.hpp
+index ff96d25..4ddc89b 100644
+--- a/profiling/common/include/Counter.hpp
++++ b/profiling/common/include/Counter.hpp
+@@ -1,10 +1,11 @@
+ //
+-// Copyright © 2022 Arm Ltd. All rights reserved.
++// Copyright © 2022,2023 Arm Ltd and Contributors. All rights reserved.
+ // SPDX-License-Identifier: MIT
  //
  
- #include <client/include/Holder.hpp>
-+#include <string>
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
  
  namespace arm
- {
---- armnn-23.02/profiling/client/include/Holder.hpp.orig	2023-03-21 14:36:13.377591628 +0100
-+++ armnn-23.02/profiling/client/include/Holder.hpp	2023-03-21 14:36:31.325798921 +0100
-@@ -8,6 +8,7 @@
- #include <mutex>
- #include <vector>
- #include <set>
-+#include <string>
+diff --git a/src/armnnUtils/VerificationHelpers.hpp b/src/armnnUtils/VerificationHelpers.hpp
+index be09ba9..508cdc0 100644
+--- a/src/armnnUtils/VerificationHelpers.hpp
++++ b/src/armnnUtils/VerificationHelpers.hpp
+@@ -1,11 +1,11 @@
+ //
+-// Copyright © 2017 Arm Ltd. All rights reserved.
++// Copyright © 2017,2023 Arm Ltd and Contributors. All rights reserved.
+ // SPDX-License-Identifier: MIT
+ //
  
- namespace arm
- {
+ #include <iostream>
+ #include <sstream>
+-
++#include <cstdint>
+ #include <armnn/Exceptions.hpp>
+ 
+ namespace armnnUtils
diff --git a/armnn.changes b/armnn.changes
index 7e0c5f3..ff35eec 100644
--- a/armnn.changes
+++ b/armnn.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr  5 06:06:27 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Update armnn-fix-gcc13.patch with upstream patch
+
 -------------------------------------------------------------------
 Tue Mar 21 10:45:26 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>