diff options
| author | Pablo Marquez Tello <pablo.tello@arm.com> | 2023-03-29 11:42:30 +0100 |
|---|---|---|
| committer | Pablo Marquez Tello <pablo.tello@arm.com> | 2023-03-29 15:39:49 +0000 |
| commit | 732c1b218bd78bf13e37d0b6e541a2b3573b87a9 (patch) | |
| tree | f3295d765633b8f809c2e147e980a8de18064e8c /support | |
| parent | 573a33f3dab9f885b6c062146adf9a0568c682c1 (diff) | |
| download | ComputeLibrary-732c1b218bd78bf13e37d0b6e541a2b3573b87a9.tar.gz | |
Fix GCC13 compiler errors
* Removed namespace arm_compute::utils::requires to fix the build error
‘requires’ is a keyword in C++20 [-Wc++20-compat]
* Added missing includes for cstdint.h
* Resolves MLCE-1040
Change-Id: I08842a273a4422f8e9b10daded680f521efe26e0
Signed-off-by: Pablo Marquez Tello <pablo.tello@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/9388
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Viet-Hoa Do <viet-hoa.do@arm.com>
Reviewed-by: Jakub Sujak <jakub.sujak@arm.com>
Benchmark: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'support')
| -rw-r--r-- | support/AclRequires.h (renamed from support/Requires.h) | 11 | ||||
| -rw-r--r-- | support/Rounding.h | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/support/Requires.h b/support/AclRequires.h index 21c98ca766..1c20f7fbc3 100644 --- a/support/Requires.h +++ b/support/AclRequires.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021 Arm Limited. + * Copyright (c) 2018-2021, 2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -21,15 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef ARM_COMPUTE_UTILS_REQUIRES_H -#define ARM_COMPUTE_UTILS_REQUIRES_H +#ifndef ARM_COMPUTE_UTILS_ACLREQUIRES_H +#define ARM_COMPUTE_UTILS_ACLREQUIRES_H namespace arm_compute { namespace utils { -namespace requires -{ // *INDENT-OFF* // clang-format off namespace detail @@ -42,10 +40,9 @@ enum class enabler /** Requirements as template */ #define ARM_COMPUTE_REQUIRES_T(...) template <bool Cond = (__VA_ARGS__), typename std::enable_if<Cond, int>::type = 0> /** Requirements as template argument */ -#define ARM_COMPUTE_REQUIRES_TA(...) typename = typename std::enable_if<(__VA_ARGS__), arm_compute::utils::requires::detail::enabler>::type +#define ARM_COMPUTE_REQUIRES_TA(...) typename = typename std::enable_if<(__VA_ARGS__), arm_compute::utils::detail::enabler>::type // clang-format on // *INDENT-ON* -} // namespace requires } // namespace utils } // namespace arm_compute #endif /*ARM_COMPUTE_UTILS_REQUIRES_H */ diff --git a/support/Rounding.h b/support/Rounding.h index 47c8f76834..e2732dc459 100644 --- a/support/Rounding.h +++ b/support/Rounding.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021 Arm Limited. + * Copyright (c) 2018-2021, 2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -26,7 +26,7 @@ #include "arm_compute/core/Error.h" #include "arm_compute/core/utils/misc/Traits.h" -#include "support/Requires.h" +#include "support/AclRequires.h" #include "support/ToolchainSupport.h" #include <cmath> |