From 59eed0d84f20d7acf97609554d61528b4790e9b0 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Wed, 26 Oct 2011 13:15:42 +0000 Subject: [PATCH] added a workaround for gcc 4.6 higher, fftw 3.3 or higher and root 5.30.03 or lower. The problem is rootcint which doesn't know __float128 --- src/external/Nonlocal/PNL_PippardFitter.h | 4 ++++ src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h | 4 ++++ src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h | 4 ++++ src/external/libFitPofB/include/TPofTCalc.h | 5 +++++ src/external/libLFRelaxation/TLFRelaxation.h | 5 +++++ 5 files changed, 22 insertions(+) diff --git a/src/external/Nonlocal/PNL_PippardFitter.h b/src/external/Nonlocal/PNL_PippardFitter.h index dc1a11e9..1cd6b619 100644 --- a/src/external/Nonlocal/PNL_PippardFitter.h +++ b/src/external/Nonlocal/PNL_PippardFitter.h @@ -32,6 +32,10 @@ #ifndef _PNL_PIPPARDFITTER_H_ #define _PNL_PIPPARDFITTER_H_ +// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower +#ifdef __CINT__ +typedef struct { char a[7]; } __float128; // needed since cint doesn't know it +#endif #include #include "PUserFcnBase.h" diff --git a/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h b/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h index 63d488e5..2a2bd17d 100644 --- a/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h +++ b/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h @@ -35,6 +35,10 @@ #include using namespace std; +// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower +#ifdef __CINT__ +typedef struct { char a[7]; } __float128; // needed since cint doesn't know it +#endif #include "fftw3.h" /** diff --git a/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h b/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h index d6f8e922..70f46d3a 100644 --- a/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h +++ b/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h @@ -36,6 +36,10 @@ #include using namespace std; +// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower +#ifdef __CINT__ +typedef struct { char a[7]; } __float128; // needed since cint doesn't know it +#endif #include "fftw3.h" //-------------------- diff --git a/src/external/libFitPofB/include/TPofTCalc.h b/src/external/libFitPofB/include/TPofTCalc.h index 3988aefd..f6e6894c 100644 --- a/src/external/libFitPofB/include/TPofTCalc.h +++ b/src/external/libFitPofB/include/TPofTCalc.h @@ -32,6 +32,11 @@ #define _TPofTCalc_H_ #include "TPofBCalc.h" + +// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower +#ifdef __CINT__ +typedef struct { char a[7]; } __float128; // needed since cint doesn't know it +#endif #include "fftw3.h" #include diff --git a/src/external/libLFRelaxation/TLFRelaxation.h b/src/external/libLFRelaxation/TLFRelaxation.h index bf2370c0..abb6b34e 100644 --- a/src/external/libLFRelaxation/TLFRelaxation.h +++ b/src/external/libLFRelaxation/TLFRelaxation.h @@ -39,6 +39,11 @@ using namespace std; #include "PUserFcnBase.h" + +// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower +#ifdef __CINT__ +typedef struct { char a[7]; } __float128; // needed since cint doesn't know it +#endif #include "fftw3.h" #include "BMWIntegrator.h"