From e4e453402c6a04806553b218f155827674805fc2 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Mon, 11 Feb 2019 16:39:37 +1100 Subject: [PATCH] AP_HAL: rearrange headers for consistency Move attribute definitions all into AP_Common, rather than being split between two files Remove unused SITL_printf macros Stop AP_Common including board information Include AP_Common.h in AP_HAL::Sempahore for WARN_IF_UNUSED; this was the cause of a circular import problem fixed by other commits in this patch. --- libraries/AP_HAL/AP_HAL_Macros.h | 16 ++-------------- libraries/AP_HAL/Semaphores.h | 2 ++ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/libraries/AP_HAL/AP_HAL_Macros.h b/libraries/AP_HAL/AP_HAL_Macros.h index b62840006c..f0c6f1bca7 100644 --- a/libraries/AP_HAL/AP_HAL_Macros.h +++ b/libraries/AP_HAL/AP_HAL_Macros.h @@ -1,23 +1,11 @@ #pragma once +#include + /* macros to allow code to build on multiple platforms more easily */ -#ifdef __GNUC__ - #define WARN_IF_UNUSED __attribute__ ((warn_unused_result)) -#else - #define WARN_IF_UNUSED -#endif - -// use this to avoid issues between C++11 with NuttX and C++10 on -// other platforms. -#if !(defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L) -# define constexpr const -#endif - -#define NORETURN __attribute__ ((noreturn)) - #if CONFIG_HAL_BOARD == HAL_BOARD_SITL || CONFIG_HAL_BOARD == HAL_BOARD_LINUX /* allow double maths on Linux and SITL to avoid problems with system headers diff --git a/libraries/AP_HAL/Semaphores.h b/libraries/AP_HAL/Semaphores.h index 818a52259b..7cce91a248 100644 --- a/libraries/AP_HAL/Semaphores.h +++ b/libraries/AP_HAL/Semaphores.h @@ -2,6 +2,8 @@ #include "AP_HAL_Namespace.h" +#include + #define HAL_SEMAPHORE_BLOCK_FOREVER 0 class AP_HAL::Semaphore {