From adfb209dad5e0a14c5c172c22737464fe3e0fbee Mon Sep 17 00:00:00 2001 From: Gennady Pospelov <g.pospelov@fz-juelich.de> Date: Thu, 30 Apr 2020 06:18:06 +0200 Subject: [PATCH] Missed include --- Core/Basics/Macros.h | 31 ++++++++++++++++--------------- Core/Particle/TRange.h | 2 ++ 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Core/Basics/Macros.h b/Core/Basics/Macros.h index b1e4f671a8a..bf2d688260b 100644 --- a/Core/Basics/Macros.h +++ b/Core/Basics/Macros.h @@ -36,22 +36,23 @@ http://gcc.gnu.org/onlinedocs/gcc-4.4.7/gcc/Diagnostic-Pragmas.html */ #if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402 -#define GCC_DIAG_STR(s) #s -#define GCC_DIAG_JOINSTR(x, y) GCC_DIAG_STR(x##y) -#define GCC_DIAG_DO_PRAGMA(x) _Pragma(#x) -#define GCC_DIAG_PRAGMA(x) GCC_DIAG_DO_PRAGMA(GCC diagnostic x) -#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406 -#define GCC_DIAG_OFF(x) \ - GCC_DIAG_PRAGMA(push) \ - GCC_DIAG_PRAGMA(ignored GCC_DIAG_JOINSTR(-W, x)) -#define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(pop) + #define GCC_DIAG_STR(s) #s + #define GCC_DIAG_JOINSTR(x,y) GCC_DIAG_STR(x ## y) + # define GCC_DIAG_DO_PRAGMA(x) _Pragma (#x) + # define GCC_DIAG_PRAGMA(x) GCC_DIAG_DO_PRAGMA(GCC diagnostic x) + # if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406 + # define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(push) \ + GCC_DIAG_PRAGMA(ignored GCC_DIAG_JOINSTR(-W,x)) + # define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(pop) + # else + # define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(ignored GCC_DIAG_JOINSTR(-W,x)) + # define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(warning GCC_DIAG_JOINSTR(-W,x)) + # endif #else -#define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(ignored GCC_DIAG_JOINSTR(-W, x)) -#define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(warning GCC_DIAG_JOINSTR(-W, x)) -#endif -#else -#define GCC_DIAG_OFF(x) -#define GCC_DIAG_ON(x) + # define GCC_DIAG_OFF(x) + # define GCC_DIAG_ON(x) #endif #endif // MACROS_H + + diff --git a/Core/Particle/TRange.h b/Core/Particle/TRange.h index f85b61700e1..f15c1370bc1 100644 --- a/Core/Particle/TRange.h +++ b/Core/Particle/TRange.h @@ -15,6 +15,8 @@ #ifndef TRANGE_H #define TRANGE_H +#include <cstddef> + //! An interval [lowerBound..upperBound[. //! @ingroup tools_internal -- GitLab