From 7d0c89185c7ca80f84a3f7a007fb30eaf1b512e1 Mon Sep 17 00:00:00 2001 From: Laurent THOMAS <laurent.thomas@open-cells.com> Date: Fri, 13 Dec 2024 16:04:01 +0100 Subject: [PATCH] gcc warning on #define duplicated --- common/utils/threadPool/task_ans.h | 2 ++ openair1/PHY/defs_nr_UE.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/common/utils/threadPool/task_ans.h b/common/utils/threadPool/task_ans.h index 4d1203555df..9bdf55b2914 100644 --- a/common/utils/threadPool/task_ans.h +++ b/common/utils/threadPool/task_ans.h @@ -31,7 +31,9 @@ extern "C" { #include <stdatomic.h> #else #include <atomic> +#ifndef _Atomic #define _Atomic(X) std::atomic<X> +#endif #define _Alignas(X) alignas(X) #endif diff --git a/openair1/PHY/defs_nr_UE.h b/openair1/PHY/defs_nr_UE.h index b64cb20752e..dd035a73e3b 100644 --- a/openair1/PHY/defs_nr_UE.h +++ b/openair1/PHY/defs_nr_UE.h @@ -34,8 +34,10 @@ #ifdef __cplusplus #include <atomic> +#ifndef _Atomic #define _Atomic(X) std::atomic< X > #endif +#endif #include "defs_nr_common.h" #include "CODING/nrPolar_tools/nr_polar_pbch_defs.h" -- GitLab