aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo Marquez Tello <pablo.tello@arm.com>2023-03-31 15:57:43 +0100
committerTeresaARM <teresa.charlinreyes@arm.com>2023-04-05 11:25:36 +0000
commit1bf35f5b8b480b2af3e904cb64e4bd5c6147b0fb (patch)
tree3caf924d42b4b53373f1a505aca36db09ff609ee
parentf0755de796bbe6a763fbfc349465484c88b9b3eb (diff)
downloadarmnn-1bf35f5b8b480b2af3e904cb64e4bd5c6147b0fb.tar.gz
Fix gcc 13 compiler errors
* Resolves MLCE-1040 Change-Id: I32878ed70af356832403e83dcb63b0b89a8a84e3 Signed-off-by: Pablo Marquez Tello <pablo.tello@arm.com>
-rw-r--r--include/armnn/utility/TransformIterator.hpp13
-rw-r--r--profiling/client/include/CounterIdMap.hpp3
-rw-r--r--profiling/common/include/Counter.hpp3
-rw-r--r--src/armnnUtils/VerificationHelpers.hpp4
4 files changed, 15 insertions, 8 deletions
diff --git a/include/armnn/utility/TransformIterator.hpp b/include/armnn/utility/TransformIterator.hpp
index f65ac790d0..b038447f36 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 @@ template<typename Function,
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
{
-
public:
+ using iterator_category = Category;
+ using value_type = T;
+ using difference_type = Distance;
+ using pointer = Pointer;
+ using reference = Reference;
+
TransformIterator() = default;
TransformIterator(TransformIterator const& transformIterator) = default;
@@ -83,4 +88,4 @@ constexpr TransformIterator<Function, Iterator> MakeTransformIterator(Iterator i
return TransformIterator<Function, Iterator>(i, f);
}
-} \ No newline at end of file
+}
diff --git a/profiling/client/include/CounterIdMap.hpp b/profiling/client/include/CounterIdMap.hpp
index cce7184c46..45cad7b2c6 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 <cstdint>
#include <map>
#include <string>
diff --git a/profiling/common/include/Counter.hpp b/profiling/common/include/Counter.hpp
index ff96d257e7..4ddc89b45d 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
//
#pragma once
+#include <cstdint>
#include <string>
namespace arm
diff --git a/src/armnnUtils/VerificationHelpers.hpp b/src/armnnUtils/VerificationHelpers.hpp
index be09ba9294..508cdc032e 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
//
#include <iostream>
#include <sstream>
-
+#include <cstdint>
#include <armnn/Exceptions.hpp>
namespace armnnUtils