diff --git a/acinclude.m4 b/acinclude.m4 index 0c0ad9d7e..ad9419c9f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -18,7 +18,7 @@ dnl The macro defines the following substitution variables dnl dnl ROOTCONF full path to root-config dnl ROOTEXEC full path to root -dnl ROOTCINT full path to rootcint +dnl ROOTCLING full path to rootcling dnl ROOTLIBDIR Where the ROOT libraries are dnl ROOTINCDIR Where the ROOT headers are dnl ROOTETCDIR Where the ROOT configuration is @@ -29,7 +29,7 @@ dnl ROOTAUXLIBS Auxilary libraries and linker flags for ROOT dnl ROOTAUXCFLAGS Auxilary compiler flags dnl ROOTRPATH Same as ROOTLIBDIR dnl -dnl The macro will fail if root-config and rootcint isn't found. +dnl The macro will fail if root-config and rootcling isn't found. dnl dnl Christian Holm Christensen dnl @@ -49,10 +49,10 @@ AC_DEFUN([ROOT_PATH], fi AC_PATH_PROG(ROOTCONF, root-config , no, $rootbin) AC_PATH_PROG(ROOTEXEC, root , no, $rootbin) - AC_PATH_PROG(ROOTCINT, rootcint , no, $rootbin) + AC_PATH_PROG(ROOTCLING, rootcling, no, $rootbin) if test ! x"$ROOTCONF" = "xno" && \ - test ! x"$ROOTCINT" = "xno" ; then + test ! x"$ROOTCLING" = "xno" ; then # define some variables ROOTLIBDIR=`$ROOTCONF --libdir` diff --git a/src/classes/Makefile.am b/src/classes/Makefile.am index daccba1d2..127037670 100644 --- a/src/classes/Makefile.am +++ b/src/classes/Makefile.am @@ -105,7 +105,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h - @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ + @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ lib_LTLIBRARIES = libPUserFcnBase.la libPMusr.la diff --git a/src/classes/PFourier.cpp b/src/classes/PFourier.cpp index 269779ff9..aef1c081f 100644 --- a/src/classes/PFourier.cpp +++ b/src/classes/PFourier.cpp @@ -402,7 +402,7 @@ PFourier::PFourier(TH1F *data, Int_t unitTag, Double_t startTime, Double_t endTi fDks.setAPI("Cuda", 4); fDks.setDevice("-gpu", 4); fDks.initDevice(); - int dimsize[3] = {fNoOfBins, 1, 1}; + int dimsize[3] = {(int)fNoOfBins, 1, 1}; fDks.setupFFT(1, dimsize); // allocate memory on accelerator int ierr; @@ -476,7 +476,7 @@ void PFourier::Transform(UInt_t apodizationTag) fftw_execute(fFFTwPlan); } else { #ifdef HAVE_DKS - int dimsize[3] = {fNoOfBins, 1, 1}; + int dimsize[3] = {(int)fNoOfBins, 1, 1}; int status=0, size=fNoOfBins/2+1; // write data to the accelerator status = fDks.writeData(fReal_ptr, fInDKS, fNoOfBins); @@ -516,8 +516,7 @@ void PFourier::Transform(UInt_t apodizationTag) #ifdef HAVE_DKS re = fOutDKS[i].real() * cos(phase) + fOutDKS[i].imag() * sin(phase); im = -fOutDKS[i].real() * sin(phase) + fOutDKS[i].imag() * cos(phase); - fOutDKS[i].real() = re; - fOutDKS[i].imag() = im; + fOutDKS[i] = complex(re, im); #endif } } diff --git a/src/external/BMWtools/Makefile.am b/src/external/BMWtools/Makefile.am index a815513dc..9fd75b8b2 100644 --- a/src/external/BMWtools/Makefile.am +++ b/src/external/BMWtools/Makefile.am @@ -33,7 +33,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h - @ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^ + @ROOTCLING@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^ lib_LTLIBRARIES = libBMWtools.la diff --git a/src/external/MagProximity/Makefile.am b/src/external/MagProximity/Makefile.am index f53337c54..23197c950 100644 --- a/src/external/MagProximity/Makefile.am +++ b/src/external/MagProximity/Makefile.am @@ -39,7 +39,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h - @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ + @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ lib_LTLIBRARIES = libPMagProximityFitter.la diff --git a/src/external/MusrRoot/Makefile.am b/src/external/MusrRoot/Makefile.am index 12d13f716..0b5dcb054 100644 --- a/src/external/MusrRoot/Makefile.am +++ b/src/external/MusrRoot/Makefile.am @@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h - @ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^ + @ROOTCLING@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^ lib_LTLIBRARIES = libTMusrRunHeader.la diff --git a/src/external/Nonlocal/Makefile.am b/src/external/Nonlocal/Makefile.am index a6e217b93..1ca1d2cbe 100644 --- a/src/external/Nonlocal/Makefile.am +++ b/src/external/Nonlocal/Makefile.am @@ -39,7 +39,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h - @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ + @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ lib_LTLIBRARIES = libPNL_PippardFitter.la diff --git a/src/external/Nonlocal/PNL_PippardFitter.h b/src/external/Nonlocal/PNL_PippardFitter.h index 95366ea7b..afb5f6964 100644 --- a/src/external/Nonlocal/PNL_PippardFitter.h +++ b/src/external/Nonlocal/PNL_PippardFitter.h @@ -31,9 +31,9 @@ #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 __CLING__ -typedef struct { char a[7]; } __float128; // needed since cint doesn't know it -#endif +//#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/TLemRunHeader/Makefile.am b/src/external/TLemRunHeader/Makefile.am index 0d927b9da..782e1bea8 100644 --- a/src/external/TLemRunHeader/Makefile.am +++ b/src/external/TLemRunHeader/Makefile.am @@ -36,7 +36,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cxx *Dict.h *Dict* *~ core %Dict.cxx %Dict.h: %.h %LinkDef.h - @ROOTCINT@ -v -f $*Dict.cxx -c -p $(INCLUDES) $^ + @ROOTCLING@ -v -f $*Dict.cxx -c -p $(INCLUDES) $^ lib_LTLIBRARIES = libTLemRunHeader.la diff --git a/src/external/libBNMR/Makefile.am b/src/external/libBNMR/Makefile.am index 8023d07b2..f099256c5 100644 --- a/src/external/libBNMR/Makefile.am +++ b/src/external/libBNMR/Makefile.am @@ -26,7 +26,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h - @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ + @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ lib_LTLIBRARIES = libBNMR.la diff --git a/src/external/libCalcMeanFieldsLEM/Makefile.am b/src/external/libCalcMeanFieldsLEM/Makefile.am index 6cb04abed..032aa1ebe 100644 --- a/src/external/libCalcMeanFieldsLEM/Makefile.am +++ b/src/external/libCalcMeanFieldsLEM/Makefile.am @@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h - @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ + @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ lib_LTLIBRARIES = libCalcMeanFieldsLEM.la diff --git a/src/external/libFitPofB/classes/Makefile.am b/src/external/libFitPofB/classes/Makefile.am index 8d6bf04f4..0726d0d05 100644 --- a/src/external/libFitPofB/classes/Makefile.am +++ b/src/external/libFitPofB/classes/Makefile.am @@ -50,7 +50,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ ../include/*~ core %Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h - @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ + @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ lib_LTLIBRARIES = libFitPofB.la diff --git a/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h b/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h index 73c6778e7..f918a151b 100644 --- a/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h +++ b/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h @@ -34,9 +34,9 @@ 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 __CLING__ -typedef struct { char a[7]; } __float128; // needed since cint doesn't know it -#endif +//#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 c8e9b42cb..8fa7da44c 100644 --- a/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h +++ b/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h @@ -35,9 +35,9 @@ 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 __CLING__ -typedef struct { char a[7]; } __float128; // needed since cint doesn't know it -#endif +//#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 16035e94f..34769b200 100644 --- a/src/external/libFitPofB/include/TPofTCalc.h +++ b/src/external/libFitPofB/include/TPofTCalc.h @@ -32,9 +32,9 @@ #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 __CLING__ -typedef struct { char a[7]; } __float128; // needed since cint doesn't know it -#endif +//#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/libGapIntegrals/Makefile.am b/src/external/libGapIntegrals/Makefile.am index dbbbf9ae9..7edbd1c34 100644 --- a/src/external/libGapIntegrals/Makefile.am +++ b/src/external/libGapIntegrals/Makefile.am @@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h - @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ + @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ lib_LTLIBRARIES = libGapIntegrals.la diff --git a/src/external/libGbGLF/Makefile.am b/src/external/libGbGLF/Makefile.am index 8aaad4bc2..61c9d2bc4 100644 --- a/src/external/libGbGLF/Makefile.am +++ b/src/external/libGbGLF/Makefile.am @@ -26,7 +26,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h - @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ + @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ lib_LTLIBRARIES = libGbGLF.la diff --git a/src/external/libLFRelaxation/Makefile.am b/src/external/libLFRelaxation/Makefile.am index 0ef6a8d8d..3b6ca9f3d 100644 --- a/src/external/libLFRelaxation/Makefile.am +++ b/src/external/libLFRelaxation/Makefile.am @@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h - @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ + @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ lib_LTLIBRARIES = libLFRelaxation.la diff --git a/src/external/libLFRelaxation/TLFRelaxation.h b/src/external/libLFRelaxation/TLFRelaxation.h index 7952ad3fe..1b000761f 100644 --- a/src/external/libLFRelaxation/TLFRelaxation.h +++ b/src/external/libLFRelaxation/TLFRelaxation.h @@ -39,9 +39,9 @@ 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 __CLING__ -typedef struct { char a[7]; } __float128; // needed since cint doesn't know it -#endif +//#ifdef __CINT__ +//typedef struct { char a[7]; } __float128; // needed since cint doesn't know it +//#endif #include "fftw3.h" #include "BMWIntegrator.h" diff --git a/src/external/libPhotoMeissner/classes/Makefile.am b/src/external/libPhotoMeissner/classes/Makefile.am index 99a4de90e..13aeba14a 100644 --- a/src/external/libPhotoMeissner/classes/Makefile.am +++ b/src/external/libPhotoMeissner/classes/Makefile.am @@ -36,7 +36,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = ../classes/*Dict* ../include/*Dict.* *~ core %Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h - @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ + @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ lib_LTLIBRARIES = libPPhotoMeissner.la diff --git a/src/external/libSpinValve/classes/Makefile.am b/src/external/libSpinValve/classes/Makefile.am index ec4033e74..59e5a1779 100644 --- a/src/external/libSpinValve/classes/Makefile.am +++ b/src/external/libSpinValve/classes/Makefile.am @@ -36,7 +36,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = ../classes/*Dict.* ../include/*Dict.* *~ core %Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h - @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ + @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ lib_LTLIBRARIES = libPSpinValve.la diff --git a/src/external/libZFRelaxation/Makefile.am b/src/external/libZFRelaxation/Makefile.am index ef04d9660..8389b0bf6 100644 --- a/src/external/libZFRelaxation/Makefile.am +++ b/src/external/libZFRelaxation/Makefile.am @@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h - @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ + @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ lib_LTLIBRARIES = libZFRelaxation.la diff --git a/src/include/PMusr.h b/src/include/PMusr.h index 7ede02ac6..7baa87fbd 100644 --- a/src/include/PMusr.h +++ b/src/include/PMusr.h @@ -37,9 +37,9 @@ using namespace std; #include // the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower -#ifdef __CLING__ -typedef struct { char a[7]; } __float128; // needed since cint doesn't know it -#endif +//#ifdef __CINT__ +//typedef struct { char a[7]; } __float128; // needed since cint doesn't know it +//#endif #include "fftw3.h" #define PMUSR_SUCCESS 0 diff --git a/src/musrt0.cpp b/src/musrt0.cpp index 272ebe18b..197e60b72 100644 --- a/src/musrt0.cpp +++ b/src/musrt0.cpp @@ -111,7 +111,7 @@ Bool_t musrt0_item(TApplication &app, PMsrHandler *msrHandler, PMusrT0Data &data // set timeout musrT0->SetTimeout(timeout); - // set the msr-file handler. The handler cannot be transfered at construction time since rootcint is not able to handle the PMsrHandler class + // set the msr-file handler. The handler cannot be transfered at construction time since rootcling is not able to handle the PMsrHandler class musrT0->SetMsrHandler(msrHandler); // check if only t0, data-, and bkg-range is wished, if not, only initialize t0 at this point diff --git a/src/musrview.cpp b/src/musrview.cpp index 0285e0081..55e496909 100644 --- a/src/musrview.cpp +++ b/src/musrview.cpp @@ -330,7 +330,7 @@ int main(int argc, char *argv[]) musrCanvas->SetTimeout(timeout); - // ugly but rootcint cannot handle the spirit-parser framework + // ugly but rootcling cannot handle the spirit-parser framework musrCanvas->SetMsrHandler(msrHandler); musrCanvas->SetRunListCollection(runListCollection);