From 18d037fdf2bf648919a3ea4354daa3d4ce2c39e9 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Tue, 7 Feb 2017 16:12:49 +0100 Subject: [PATCH] adopted dks to root6 (branch dks6). Not yet tested. --- configure.ac | 5 ++- doc/examples/UserFcn/PUserFcnLinkDef.h | 4 +-- src/classes/Makefile.am | 10 +++++- src/classes/PFourier.cpp | 2 +- src/classes/PRunAsymmetry.cpp | 4 +-- src/classes/PRunAsymmetryRRF.cpp | 4 +-- .../BMWtools/BMWStartupHandlerLinkDef.h | 4 +-- src/external/BMWtools/Makefile.am | 5 ++- src/external/MagProximity/Makefile.am | 7 ++++- .../MagProximity/PMPStartupHandlerLinkDef.h | 2 +- .../MagProximity/PMagProximityFitterLinkDef.h | 2 +- .../MuSR_software/Class_MuSR_PSI/Makefile.am | 1 - .../Class_MuSR_PSI/MuSR_td_PSI_bin.cpp | 2 +- src/external/MuSR_software/Makefile.am | 2 -- src/external/MusrRoot/Makefile.am | 5 ++- src/external/MusrRoot/TMusrRunHeaderLinkDef.h | 2 +- src/external/Nonlocal/Makefile.am | 7 ++++- src/external/Nonlocal/PNL_PippardFitter.h | 2 +- .../Nonlocal/PNL_PippardFitterLinkDef.h | 2 +- .../Nonlocal/PNL_StartupHandlerLinkDef.h | 2 +- src/external/TLemRunHeader/Makefile.am | 7 ++++- .../TLemRunHeader/TLemRunHeaderLinkDef.h | 2 +- src/external/TLemRunHeader/TLemStatsLinkDef.h | 2 +- src/external/libBNMR/TBNMRLinkDef.h | 4 +-- src/external/libCalcMeanFieldsLEM/Makefile.am | 5 ++- .../TCalcMeanFieldsLEMLinkDef.h | 4 +-- src/external/libFitPofB/classes/Makefile.am | 8 ++++- .../include/TBulkTriVortexFieldCalc.h | 2 +- .../include/TFilmTriVortexFieldCalc.h | 2 +- .../libFitPofB/include/TLondon1DLinkDef.h | 4 +-- src/external/libFitPofB/include/TPofTCalc.h | 2 +- .../libFitPofB/include/TSkewedGssLinkDef.h | 4 +-- .../libFitPofB/include/TVortexLinkDef.h | 4 +-- src/external/libGapIntegrals/Makefile.am | 5 ++- .../libGapIntegrals/TGapIntegralsLinkDef.h | 4 +-- src/external/libGbGLF/PGbGLFLinkDef.h | 4 +-- src/external/libLFRelaxation/Makefile.am | 5 ++- src/external/libLFRelaxation/TLFRelaxation.h | 2 +- .../libLFRelaxation/TLFRelaxationLinkDef.h | 4 +-- .../libPhotoMeissner/classes/Makefile.am | 5 +++ .../libPhotoMeissner/include/PPhotoMeissner.h | 4 +-- .../include/PPhotoMeissnerLinkDef.h | 2 +- .../include/PStartupHandler_PMLinkDef.h | 2 +- src/external/libSpinValve/classes/Makefile.am | 5 +++ .../libSpinValve/include/PSkewedLorentzian.h | 4 +-- .../include/PSkewedLorentzianLinkDef.h | 2 +- .../include/PStartupHandler_SVLinkDef.h | 2 +- src/external/libZFRelaxation/Makefile.am | 5 ++- .../libZFRelaxation/ZFRelaxationLinkDef.h | 4 +-- src/include/PFourierCanvasLinkDef.h | 2 +- src/include/PMusr.h | 2 +- src/include/PMusrCanvasLinkDef.h | 2 +- src/include/PMusrT0LinkDef.h | 2 +- src/include/PStartupHandlerLinkDef.h | 2 +- src/include/PUserFcnBaseLinkDef.h | 2 +- src/musredit_qt5/forms/PPrefsDialog.ui | 31 +++++++++++++------ .../MeissnerNonMuSR/PMeissnerNonMuSRLinkDef.h | 2 +- .../Makefile.PSimulateMuTransition | 2 ++ .../PSimulateMuTransitionLinkDef.h | 2 +- .../PAddPoissonNoiseLinkDef.h | 2 +- src/tests/canvasMenu/PMyCanvasLinkDef.h | 2 +- .../eventHandler/PEventHandlerTestLinkDef.h | 2 +- src/tests/spirit/PFunctionHandler.h | 4 +-- src/tests/userFcn/TUserFcnBaseLinkDef.h | 2 +- src/tests/userFcn/TUserFcnLinkDef.h | 2 +- src/tests/userFcnGlobal/PRelaxLinkDef.h | 2 +- 66 files changed, 160 insertions(+), 88 deletions(-) diff --git a/configure.ac b/configure.ac index 177bc35f..339a75c5 100644 --- a/configure.ac +++ b/configure.ac @@ -1209,6 +1209,9 @@ case "${host_cpu}" in ;; esac +CXXFLAGS="-std=c++11 ${CXXFLAGS}" +AC_SUBST(CXXFLAGS) + LOCAL_BIN_CXXFLAGS="${CPUFLAGS} -Wall -Wno-trigraphs" LOCAL_LIB_CXXFLAGS="${LOCAL_BIN_CXXFLAGS}" LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS}" @@ -1233,7 +1236,7 @@ case "$host" in ;; *-*-darwin*) ARCH=DARWIN - LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D__linux__" + LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D_Darwin_" ;; *) ARCH=OTHERUNIX diff --git a/doc/examples/UserFcn/PUserFcnLinkDef.h b/doc/examples/UserFcn/PUserFcnLinkDef.h index a7f7eaa1..160da9fc 100644 --- a/doc/examples/UserFcn/PUserFcnLinkDef.h +++ b/doc/examples/UserFcn/PUserFcnLinkDef.h @@ -4,7 +4,7 @@ ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; @@ -12,4 +12,4 @@ #pragma link C++ class PUserFcn+; -#endif //__CINT__ +#endif //__CLING__ diff --git a/src/classes/Makefile.am b/src/classes/Makefile.am index 2afc9dfa..daccba1d 100644 --- a/src/classes/Makefile.am +++ b/src/classes/Makefile.am @@ -86,6 +86,14 @@ dict_cpp_sources = \ dict_cpp_sources_userFcn = \ PUserFcnBaseDict.cpp +pcmdir = $(libdir) +pcm_DATA = \ + PFourierCanvasDict_rdict.pcm \ + PMusrCanvasDict_rdict.pcm \ + PMusrT0Dict_rdict.pcm \ + PStartupHandlerDict_rdict.pcm \ + PUserFcnBaseDict_rdict.pcm + include_HEADERS = $(h_sources) $(h_sources_userFcn) noinst_HEADERS = $(h_linkdef) $(dict_h_sources) $(h_linkdef_userFcn) $(dict_h_sources_userFcn) @@ -94,7 +102,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) $(dict_cpp_sources_userFcn) $(dict_h_sources_userFcn) AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ -CLEANFILES = *Dict.cpp *Dict.h *~ core +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) $^ diff --git a/src/classes/PFourier.cpp b/src/classes/PFourier.cpp index 61518cd4..269779ff 100644 --- a/src/classes/PFourier.cpp +++ b/src/classes/PFourier.cpp @@ -625,7 +625,7 @@ TH1F* PFourier::GetPhaseOptRealFourier(const TH1F *re, const TH1F *im, vectorGetXaxis(); + const TAxis *axis = re->GetXaxis(); Int_t minBin = 1; Int_t maxBin = axis->GetNbins(); diff --git a/src/classes/PRunAsymmetry.cpp b/src/classes/PRunAsymmetry.cpp index b385b87d..f86b13e2 100644 --- a/src/classes/PRunAsymmetry.cpp +++ b/src/classes/PRunAsymmetry.cpp @@ -757,8 +757,8 @@ Bool_t PRunAsymmetry::SubtractEstimatedBkg() beamPeriod = 0.0; // check if start and end are in proper order - UInt_t start[2] = {fRunInfo->GetBkgRange(0), fRunInfo->GetBkgRange(2)}; - UInt_t end[2] = {fRunInfo->GetBkgRange(1), fRunInfo->GetBkgRange(3)}; + Int_t start[2] = {fRunInfo->GetBkgRange(0), fRunInfo->GetBkgRange(2)}; + Int_t end[2] = {fRunInfo->GetBkgRange(1), fRunInfo->GetBkgRange(3)}; for (UInt_t i=0; i<2; i++) { if (end[i] < start[i]) { cout << endl << "PRunAsymmetry::SubtractEstimatedBkg(): end = " << end[i] << " > start = " << start[i] << "! Will swap them!"; diff --git a/src/classes/PRunAsymmetryRRF.cpp b/src/classes/PRunAsymmetryRRF.cpp index cd3f27e3..ba172879 100644 --- a/src/classes/PRunAsymmetryRRF.cpp +++ b/src/classes/PRunAsymmetryRRF.cpp @@ -746,8 +746,8 @@ Bool_t PRunAsymmetryRRF::SubtractEstimatedBkg() beamPeriod = 0.0; // check if start and end are in proper order - UInt_t start[2] = {fRunInfo->GetBkgRange(0), fRunInfo->GetBkgRange(2)}; - UInt_t end[2] = {fRunInfo->GetBkgRange(1), fRunInfo->GetBkgRange(3)}; + UInt_t start[2] = {(UInt_t)fRunInfo->GetBkgRange(0), (UInt_t)fRunInfo->GetBkgRange(2)}; + UInt_t end[2] = {(UInt_t)fRunInfo->GetBkgRange(1), (UInt_t)fRunInfo->GetBkgRange(3)}; for (UInt_t i=0; i<2; i++) { if (end[i] < start[i]) { cout << endl << "PRunAsymmetryRRF::SubtractEstimatedBkg(): end = " << end[i] << " > start = " << start[i] << "! Will swap them!"; diff --git a/src/external/BMWtools/BMWStartupHandlerLinkDef.h b/src/external/BMWtools/BMWStartupHandlerLinkDef.h index 73640057..b4e9e543 100644 --- a/src/external/BMWtools/BMWStartupHandlerLinkDef.h +++ b/src/external/BMWtools/BMWStartupHandlerLinkDef.h @@ -29,7 +29,7 @@ ***************************************************************************/ // root dictionary stuff -------------------------------------------------- -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; @@ -37,6 +37,6 @@ #pragma link C++ class BMWStartupHandler+; -#endif //__CINT__ +#endif //__CLING__ // root dictionary stuff -------------------------------------------------- diff --git a/src/external/BMWtools/Makefile.am b/src/external/BMWtools/Makefile.am index 81b8b494..a815513d 100644 --- a/src/external/BMWtools/Makefile.am +++ b/src/external/BMWtools/Makefile.am @@ -19,6 +19,9 @@ cpp_sources = \ dict_cpp_sources = \ BMWStartupHandlerDict.cpp +pcmdir = $(libdir) +pcm_DATA = BMWStartupHandlerDict_rdict.pcm + include_HEADERS = $(h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources) @@ -27,7 +30,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ -CLEANFILES = *Dict.cpp *Dict.h *~ core +CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h @ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^ diff --git a/src/external/MagProximity/Makefile.am b/src/external/MagProximity/Makefile.am index 45b1eeb0..f53337c5 100644 --- a/src/external/MagProximity/Makefile.am +++ b/src/external/MagProximity/Makefile.am @@ -23,6 +23,11 @@ dict_cpp_sources = \ PMagProximityFitterDict.cpp \ PMPStartupHandlerDict.cpp +pcmdir = $(libdir) +pcm_DATA = \ + PMagProximityFitterDict_rdict.pcm \ + PMPStartupHandlerDict_rdict.pcm + include_HEADERS = $(h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources) @@ -31,7 +36,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ -CLEANFILES = *Dict.cpp *Dict.h *~ core +CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ diff --git a/src/external/MagProximity/PMPStartupHandlerLinkDef.h b/src/external/MagProximity/PMPStartupHandlerLinkDef.h index 69616f29..dcba72f4 100644 --- a/src/external/MagProximity/PMPStartupHandlerLinkDef.h +++ b/src/external/MagProximity/PMPStartupHandlerLinkDef.h @@ -27,7 +27,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/external/MagProximity/PMagProximityFitterLinkDef.h b/src/external/MagProximity/PMagProximityFitterLinkDef.h index 2ddaa41f..d1ecd5e1 100644 --- a/src/external/MagProximity/PMagProximityFitterLinkDef.h +++ b/src/external/MagProximity/PMagProximityFitterLinkDef.h @@ -27,7 +27,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/external/MuSR_software/Class_MuSR_PSI/Makefile.am b/src/external/MuSR_software/Class_MuSR_PSI/Makefile.am index ce92e577..1856a2be 100644 --- a/src/external/MuSR_software/Class_MuSR_PSI/Makefile.am +++ b/src/external/MuSR_software/Class_MuSR_PSI/Makefile.am @@ -1,5 +1,4 @@ ## Process this file with automake to create Makefile.in -## $Id$ h_sources = MuSR_td_PSI_bin.h cpp_sources = MuSR_td_PSI_bin.cpp diff --git a/src/external/MuSR_software/Class_MuSR_PSI/MuSR_td_PSI_bin.cpp b/src/external/MuSR_software/Class_MuSR_PSI/MuSR_td_PSI_bin.cpp index 9065c4a6..aac7acbe 100644 --- a/src/external/MuSR_software/Class_MuSR_PSI/MuSR_td_PSI_bin.cpp +++ b/src/external/MuSR_software/Class_MuSR_PSI/MuSR_td_PSI_bin.cpp @@ -205,7 +205,7 @@ typedef long int Int32; #else /* other operating system */ /* 32 bit word length */ -#if (defined(_WIN32) || defined(__linux__) || defined(_WIN32GCC)) +#if (defined(_WIN32) || defined(__linux__) || defined(_Darwin_) || defined(_WIN32GCC)) typedef short Int16; typedef int Int32; #else diff --git a/src/external/MuSR_software/Makefile.am b/src/external/MuSR_software/Makefile.am index 9e7e4f47..3721bf7a 100644 --- a/src/external/MuSR_software/Makefile.am +++ b/src/external/MuSR_software/Makefile.am @@ -1,3 +1 @@ -## $Id$ - SUBDIRS = Class_MuSR_PSI diff --git a/src/external/MusrRoot/Makefile.am b/src/external/MusrRoot/Makefile.am index b6368e25..12d13f71 100644 --- a/src/external/MusrRoot/Makefile.am +++ b/src/external/MusrRoot/Makefile.am @@ -15,6 +15,9 @@ cpp_sources = \ dict_cpp_sources = \ TMusrRunHeaderDict.cpp +pcmdir = $(libdir) +pcm_DATA = TMusrRunHeaderDict_rdict.pcm + include_HEADERS = $(h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources) @@ -23,7 +26,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) BUILT_SOURCES = $(dict_cpp_sources) $(dist_h_sources) AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ -CLEANFILES = *Dict.cpp *Dict.h *~ core +CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h @ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^ diff --git a/src/external/MusrRoot/TMusrRunHeaderLinkDef.h b/src/external/MusrRoot/TMusrRunHeaderLinkDef.h index 5d00da6c..8606794e 100644 --- a/src/external/MusrRoot/TMusrRunHeaderLinkDef.h +++ b/src/external/MusrRoot/TMusrRunHeaderLinkDef.h @@ -27,7 +27,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/external/Nonlocal/Makefile.am b/src/external/Nonlocal/Makefile.am index 65aa2c55..a6e217b9 100644 --- a/src/external/Nonlocal/Makefile.am +++ b/src/external/Nonlocal/Makefile.am @@ -23,6 +23,11 @@ dict_cpp_sources = \ PNL_PippardFitterDict.cpp \ PNL_StartupHandlerDict.cpp +pcmdir = $(libdir) +pcm_DATA = \ + PNL_PippardFitterDict_rdict.pcm \ + PNL_StartupHandlerDict_rdict.pcm + include_HEADERS = $(h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources) @@ -31,7 +36,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ -CLEANFILES = *Dict.cpp *Dict.h *~ core +CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ diff --git a/src/external/Nonlocal/PNL_PippardFitter.h b/src/external/Nonlocal/PNL_PippardFitter.h index 02502634..95366ea7 100644 --- a/src/external/Nonlocal/PNL_PippardFitter.h +++ b/src/external/Nonlocal/PNL_PippardFitter.h @@ -31,7 +31,7 @@ #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__ +#ifdef __CLING__ typedef struct { char a[7]; } __float128; // needed since cint doesn't know it #endif #include diff --git a/src/external/Nonlocal/PNL_PippardFitterLinkDef.h b/src/external/Nonlocal/PNL_PippardFitterLinkDef.h index d641a419..0c089298 100644 --- a/src/external/Nonlocal/PNL_PippardFitterLinkDef.h +++ b/src/external/Nonlocal/PNL_PippardFitterLinkDef.h @@ -27,7 +27,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/external/Nonlocal/PNL_StartupHandlerLinkDef.h b/src/external/Nonlocal/PNL_StartupHandlerLinkDef.h index de5b24c1..6d5f49f8 100644 --- a/src/external/Nonlocal/PNL_StartupHandlerLinkDef.h +++ b/src/external/Nonlocal/PNL_StartupHandlerLinkDef.h @@ -29,7 +29,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/external/TLemRunHeader/Makefile.am b/src/external/TLemRunHeader/Makefile.am index c9be1fab..0d927b9d 100644 --- a/src/external/TLemRunHeader/Makefile.am +++ b/src/external/TLemRunHeader/Makefile.am @@ -20,6 +20,11 @@ dict_cpp_sources = \ TLemStatsDict.cxx \ TLemRunHeaderDict.cxx +pcmdir = $(libdir) +pcm_DATA = \ + TLemStatsDict_rdict.pcm \ + TLemRunHeaderDict_rdict.pcm + include_HEADERS = $(h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources) @@ -28,7 +33,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) BUILT_SOURCES = $(dict_cpp_sources) $(dist_h_sources) AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ -CLEANFILES = *Dict.cxx *Dict.h *~ core +CLEANFILES = *Dict.cxx *Dict.h *Dict* *~ core %Dict.cxx %Dict.h: %.h %LinkDef.h @ROOTCINT@ -v -f $*Dict.cxx -c -p $(INCLUDES) $^ diff --git a/src/external/TLemRunHeader/TLemRunHeaderLinkDef.h b/src/external/TLemRunHeader/TLemRunHeaderLinkDef.h index be148916..3ad6a084 100644 --- a/src/external/TLemRunHeader/TLemRunHeaderLinkDef.h +++ b/src/external/TLemRunHeader/TLemRunHeaderLinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/external/TLemRunHeader/TLemStatsLinkDef.h b/src/external/TLemRunHeader/TLemStatsLinkDef.h index 554c371d..cfe99324 100644 --- a/src/external/TLemRunHeader/TLemStatsLinkDef.h +++ b/src/external/TLemRunHeader/TLemStatsLinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/external/libBNMR/TBNMRLinkDef.h b/src/external/libBNMR/TBNMRLinkDef.h index ab23c35f..027f958d 100644 --- a/src/external/libBNMR/TBNMRLinkDef.h +++ b/src/external/libBNMR/TBNMRLinkDef.h @@ -29,7 +29,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; @@ -40,4 +40,4 @@ #pragma link C++ class SExpRlx+; #pragma link C++ class MLRes+; -#endif //__CINT__ +#endif //__CLING__ diff --git a/src/external/libCalcMeanFieldsLEM/Makefile.am b/src/external/libCalcMeanFieldsLEM/Makefile.am index b828bd82..6cb04abe 100644 --- a/src/external/libCalcMeanFieldsLEM/Makefile.am +++ b/src/external/libCalcMeanFieldsLEM/Makefile.am @@ -15,6 +15,9 @@ cpp_sources = \ dict_cpp_sources = \ TCalcMeanFieldsLEMDict.cpp +pcmdir = $(libdir) +pcm_DATA = TCalcMeanFieldsLEMDict_rdict.pcm + include_HEADERS = $(h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources) @@ -23,7 +26,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ -CLEANFILES = *Dict.cpp *Dict.h *~ core +CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ diff --git a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEMLinkDef.h b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEMLinkDef.h index 67fcb059..3f53ed8c 100644 --- a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEMLinkDef.h +++ b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEMLinkDef.h @@ -27,7 +27,7 @@ ***************************************************************************/ // root dictionary stuff -------------------------------------------------- -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; @@ -39,6 +39,6 @@ #pragma link C++ class TMeanFieldsForScTrilayer+; #pragma link C++ class TMeanFieldsForScTrilayerWithInsulator+; -#endif //__CINT__ +#endif //__CLING__ // root dictionary stuff -------------------------------------------------- diff --git a/src/external/libFitPofB/classes/Makefile.am b/src/external/libFitPofB/classes/Makefile.am index 1e881298..8d6bf04f 100644 --- a/src/external/libFitPofB/classes/Makefile.am +++ b/src/external/libFitPofB/classes/Makefile.am @@ -33,6 +33,12 @@ dict_cpp_sources = \ TSkewedGssDict.cpp \ TVortexDict.cpp +pcmdir = $(libdir) +pcm_DATA = \ + TLondon1DDict_rdict.pcm \ + TSkewedGssDict_rdict.pcm \ + TVortexDict_rdict.pcm + include_HEADERS = $(h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources) @@ -41,7 +47,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ -CLEANFILES = *Dict.cpp *Dict.h *~ ../include/*~ core +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) $^ diff --git a/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h b/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h index 1488b203..73c6778e 100644 --- a/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h +++ b/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h @@ -34,7 +34,7 @@ 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__ +#ifdef __CLING__ 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 24de60a9..c8e9b42c 100644 --- a/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h +++ b/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h @@ -35,7 +35,7 @@ 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__ +#ifdef __CLING__ typedef struct { char a[7]; } __float128; // needed since cint doesn't know it #endif #include "fftw3.h" diff --git a/src/external/libFitPofB/include/TLondon1DLinkDef.h b/src/external/libFitPofB/include/TLondon1DLinkDef.h index ccd6acff..85694ed2 100644 --- a/src/external/libFitPofB/include/TLondon1DLinkDef.h +++ b/src/external/libFitPofB/include/TLondon1DLinkDef.h @@ -27,7 +27,7 @@ ***************************************************************************/ // root dictionary stuff -------------------------------------------------- -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; @@ -41,6 +41,6 @@ #pragma link C++ class TLondon1D3LS+; //#pragma link C++ class TLondon1D4L+; -#endif //__CINT__ +#endif //__CLING__ // root dictionary stuff -------------------------------------------------- diff --git a/src/external/libFitPofB/include/TPofTCalc.h b/src/external/libFitPofB/include/TPofTCalc.h index be0bb3da..16035e94 100644 --- a/src/external/libFitPofB/include/TPofTCalc.h +++ b/src/external/libFitPofB/include/TPofTCalc.h @@ -32,7 +32,7 @@ #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__ +#ifdef __CLING__ typedef struct { char a[7]; } __float128; // needed since cint doesn't know it #endif #include "fftw3.h" diff --git a/src/external/libFitPofB/include/TSkewedGssLinkDef.h b/src/external/libFitPofB/include/TSkewedGssLinkDef.h index b542dd71..a7489cad 100644 --- a/src/external/libFitPofB/include/TSkewedGssLinkDef.h +++ b/src/external/libFitPofB/include/TSkewedGssLinkDef.h @@ -27,7 +27,7 @@ ***************************************************************************/ // root dictionary stuff -------------------------------------------------- -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; @@ -35,6 +35,6 @@ #pragma link C++ class TSkewedGss+; -#endif //__CINT__ +#endif //__CLING__ // root dictionary stuff -------------------------------------------------- diff --git a/src/external/libFitPofB/include/TVortexLinkDef.h b/src/external/libFitPofB/include/TVortexLinkDef.h index d892874c..24371b09 100644 --- a/src/external/libFitPofB/include/TVortexLinkDef.h +++ b/src/external/libFitPofB/include/TVortexLinkDef.h @@ -27,7 +27,7 @@ ***************************************************************************/ // root dictionary stuff -------------------------------------------------- -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; @@ -46,6 +46,6 @@ #pragma link C++ class TBulkAnisotropicTriVortexAGL+; #pragma link C++ class TBulkAnisotropicTriVortexAGLGlobal+; -#endif //__CINT__ +#endif //__CLING__ // root dictionary stuff -------------------------------------------------- diff --git a/src/external/libGapIntegrals/Makefile.am b/src/external/libGapIntegrals/Makefile.am index a99bab75..dbbbf9ae 100644 --- a/src/external/libGapIntegrals/Makefile.am +++ b/src/external/libGapIntegrals/Makefile.am @@ -15,6 +15,9 @@ cpp_sources = \ dict_cpp_sources = \ TGapIntegralsDict.cpp +pcmdir = $(libdir) +pcm_DATA = TGapIntegralsDict_rdict.pcm + include_HEADERS = $(h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources) @@ -23,7 +26,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ -CLEANFILES = *Dict.cpp *Dict.h *~ core +CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ diff --git a/src/external/libGapIntegrals/TGapIntegralsLinkDef.h b/src/external/libGapIntegrals/TGapIntegralsLinkDef.h index 1deab362..66ee9a3d 100644 --- a/src/external/libGapIntegrals/TGapIntegralsLinkDef.h +++ b/src/external/libGapIntegrals/TGapIntegralsLinkDef.h @@ -28,7 +28,7 @@ // root dictionary stuff -------------------------------------------------- -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; @@ -57,6 +57,6 @@ #pragma link C++ class TLambdaInvPowerLaw+; #pragma link C++ class TFilmMagnetizationDWave+; -#endif //__CINT__ +#endif //__CLING__ // root dictionary stuff -------------------------------------------------- diff --git a/src/external/libGbGLF/PGbGLFLinkDef.h b/src/external/libGbGLF/PGbGLFLinkDef.h index 30ebc943..ce64531f 100644 --- a/src/external/libGbGLF/PGbGLFLinkDef.h +++ b/src/external/libGbGLF/PGbGLFLinkDef.h @@ -27,7 +27,7 @@ ***************************************************************************/ // root dictionary stuff -------------------------------------------------- -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; @@ -35,6 +35,6 @@ #pragma link C++ class PGbGLF+; -#endif //__CINT__ +#endif //__CLING__ // root dictionary stuff -------------------------------------------------- diff --git a/src/external/libLFRelaxation/Makefile.am b/src/external/libLFRelaxation/Makefile.am index c4a085ca..0ef6a8d8 100644 --- a/src/external/libLFRelaxation/Makefile.am +++ b/src/external/libLFRelaxation/Makefile.am @@ -15,6 +15,9 @@ cpp_sources = \ dict_cpp_sources = \ TLFRelaxationDict.cpp +pcmdir = $(libdir) +pcm_DATA = TLFRelaxationDict_rdict.pcm + include_HEADERS = $(h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources) @@ -23,7 +26,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ -CLEANFILES = *Dict.cpp *Dict.h *~ core +CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ diff --git a/src/external/libLFRelaxation/TLFRelaxation.h b/src/external/libLFRelaxation/TLFRelaxation.h index 7defba45..7952ad3f 100644 --- a/src/external/libLFRelaxation/TLFRelaxation.h +++ b/src/external/libLFRelaxation/TLFRelaxation.h @@ -39,7 +39,7 @@ 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__ +#ifdef __CLING__ typedef struct { char a[7]; } __float128; // needed since cint doesn't know it #endif #include "fftw3.h" diff --git a/src/external/libLFRelaxation/TLFRelaxationLinkDef.h b/src/external/libLFRelaxation/TLFRelaxationLinkDef.h index acc86ce7..d66e788e 100644 --- a/src/external/libLFRelaxation/TLFRelaxationLinkDef.h +++ b/src/external/libLFRelaxation/TLFRelaxationLinkDef.h @@ -27,7 +27,7 @@ ***************************************************************************/ // root dictionary stuff -------------------------------------------------- -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; @@ -40,6 +40,6 @@ #pragma link C++ class TLFDynSG+; #pragma link C++ class TLFSGInterpolation+; -#endif //__CINT__ +#endif //__CLING__ // root dictionary stuff -------------------------------------------------- diff --git a/src/external/libPhotoMeissner/classes/Makefile.am b/src/external/libPhotoMeissner/classes/Makefile.am index 759aafcf..99a4de90 100644 --- a/src/external/libPhotoMeissner/classes/Makefile.am +++ b/src/external/libPhotoMeissner/classes/Makefile.am @@ -20,6 +20,11 @@ dict_cpp_sources = \ PStartupHandler_PMDict.cpp \ PPhotoMeissnerDict.cpp +pcmdir = $(libdir) +pcm_DATA = \ + PPhotoMeissnerDict_rdict.pcm \ + PStartupHandler_PMDict_rdict.pcm + include_HEADERS = $(h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources) diff --git a/src/external/libPhotoMeissner/include/PPhotoMeissner.h b/src/external/libPhotoMeissner/include/PPhotoMeissner.h index 4ac1cc65..071b2473 100644 --- a/src/external/libPhotoMeissner/include/PPhotoMeissner.h +++ b/src/external/libPhotoMeissner/include/PPhotoMeissner.h @@ -57,8 +57,8 @@ class PPhotoMeissner : public PUserFcnBase Bool_t fValid; ///< flag indicating if initialization went through smoothly - static const Double_t fDegToRad = 0.0174532925199432955; - static const Double_t fTwoPi = 6.28318530717958623; + constexpr static const Double_t fDegToRad = 0.0174532925199432955; + constexpr static const Double_t fTwoPi = 6.28318530717958623; Double_t InuMinus(const Double_t nu, const Double_t x) const; Double_t FieldFilm(const Double_t z, const vector &par) const; diff --git a/src/external/libPhotoMeissner/include/PPhotoMeissnerLinkDef.h b/src/external/libPhotoMeissner/include/PPhotoMeissnerLinkDef.h index 6a3e6c7f..faaf06e8 100644 --- a/src/external/libPhotoMeissner/include/PPhotoMeissnerLinkDef.h +++ b/src/external/libPhotoMeissner/include/PPhotoMeissnerLinkDef.h @@ -27,7 +27,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/external/libPhotoMeissner/include/PStartupHandler_PMLinkDef.h b/src/external/libPhotoMeissner/include/PStartupHandler_PMLinkDef.h index 8ddcea34..b9d6ea7a 100644 --- a/src/external/libPhotoMeissner/include/PStartupHandler_PMLinkDef.h +++ b/src/external/libPhotoMeissner/include/PStartupHandler_PMLinkDef.h @@ -27,7 +27,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/external/libSpinValve/classes/Makefile.am b/src/external/libSpinValve/classes/Makefile.am index 544d7c39..ec4033e7 100644 --- a/src/external/libSpinValve/classes/Makefile.am +++ b/src/external/libSpinValve/classes/Makefile.am @@ -20,6 +20,11 @@ dict_cpp_sources = \ PStartupHandler_SVDict.cpp \ PSkewedLorentzianDict.cpp +pcmdir = $(libdir) +pcm_DATA = \ + PStartupHandler_SVDict_rdict.pcm \ + PSkewedLorentzianDict_rdict.pcm + include_HEADERS = $(h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources) diff --git a/src/external/libSpinValve/include/PSkewedLorentzian.h b/src/external/libSpinValve/include/PSkewedLorentzian.h index 92b14ecd..56ed8536 100644 --- a/src/external/libSpinValve/include/PSkewedLorentzian.h +++ b/src/external/libSpinValve/include/PSkewedLorentzian.h @@ -59,8 +59,8 @@ class PSkewedLorentzian : public PUserFcnBase UInt_t fNoOfFields; ///< number of sampling points in field around the Lorentzian peak Double_t fRange; ///< range in which the sampling points are placed, given in units of \beta(1\pm\Delta) - static const Double_t fDegToRad = 0.0174532925199432955; - static const Double_t fTwoPi = 6.28318530717958623; + constexpr static const Double_t fDegToRad = 0.0174532925199432955; + constexpr static const Double_t fTwoPi = 6.28318530717958623; // definition of the class for the ROOT dictionary ClassDef(PSkewedLorentzian, 1) diff --git a/src/external/libSpinValve/include/PSkewedLorentzianLinkDef.h b/src/external/libSpinValve/include/PSkewedLorentzianLinkDef.h index bde07766..2567ca9e 100644 --- a/src/external/libSpinValve/include/PSkewedLorentzianLinkDef.h +++ b/src/external/libSpinValve/include/PSkewedLorentzianLinkDef.h @@ -27,7 +27,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/external/libSpinValve/include/PStartupHandler_SVLinkDef.h b/src/external/libSpinValve/include/PStartupHandler_SVLinkDef.h index b279dd80..3f5bfa39 100644 --- a/src/external/libSpinValve/include/PStartupHandler_SVLinkDef.h +++ b/src/external/libSpinValve/include/PStartupHandler_SVLinkDef.h @@ -27,7 +27,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/external/libZFRelaxation/Makefile.am b/src/external/libZFRelaxation/Makefile.am index 287d097f..ef04d966 100644 --- a/src/external/libZFRelaxation/Makefile.am +++ b/src/external/libZFRelaxation/Makefile.am @@ -15,6 +15,9 @@ cpp_sources = \ dict_cpp_sources = \ ZFRelaxationDict.cpp +pcmdir = $(libdir) +pcm_DATA = ZFRelaxationDict_rdict.pcm + include_HEADERS = $(h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources) @@ -23,7 +26,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ -CLEANFILES = *Dict.cpp *Dict.h *~ core +CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h @ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ diff --git a/src/external/libZFRelaxation/ZFRelaxationLinkDef.h b/src/external/libZFRelaxation/ZFRelaxationLinkDef.h index e4021eb8..58214ab0 100644 --- a/src/external/libZFRelaxation/ZFRelaxationLinkDef.h +++ b/src/external/libZFRelaxation/ZFRelaxationLinkDef.h @@ -27,7 +27,7 @@ ***************************************************************************/ // root dictionary stuff -------------------------------------------------- -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; @@ -37,6 +37,6 @@ #pragma link C++ class ZFMagExp+; #pragma link C++ class UniaxialStatGssKT+; -#endif //__CINT__ +#endif //__CLING__ // root dictionary stuff -------------------------------------------------- diff --git a/src/include/PFourierCanvasLinkDef.h b/src/include/PFourierCanvasLinkDef.h index af10deb8..ced7b9c9 100644 --- a/src/include/PFourierCanvasLinkDef.h +++ b/src/include/PFourierCanvasLinkDef.h @@ -27,7 +27,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/include/PMusr.h b/src/include/PMusr.h index 54bd9327..7ede02ac 100644 --- a/src/include/PMusr.h +++ b/src/include/PMusr.h @@ -37,7 +37,7 @@ 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 __CINT__ +#ifdef __CLING__ typedef struct { char a[7]; } __float128; // needed since cint doesn't know it #endif #include "fftw3.h" diff --git a/src/include/PMusrCanvasLinkDef.h b/src/include/PMusrCanvasLinkDef.h index c9c73b15..cb0aa6d4 100644 --- a/src/include/PMusrCanvasLinkDef.h +++ b/src/include/PMusrCanvasLinkDef.h @@ -27,7 +27,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/include/PMusrT0LinkDef.h b/src/include/PMusrT0LinkDef.h index d7e26cc4..38eaf5d8 100644 --- a/src/include/PMusrT0LinkDef.h +++ b/src/include/PMusrT0LinkDef.h @@ -27,7 +27,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/include/PStartupHandlerLinkDef.h b/src/include/PStartupHandlerLinkDef.h index 036977e7..2c5a9f08 100644 --- a/src/include/PStartupHandlerLinkDef.h +++ b/src/include/PStartupHandlerLinkDef.h @@ -27,7 +27,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/include/PUserFcnBaseLinkDef.h b/src/include/PUserFcnBaseLinkDef.h index 843c143a..43b3f566 100644 --- a/src/include/PUserFcnBaseLinkDef.h +++ b/src/include/PUserFcnBaseLinkDef.h @@ -27,7 +27,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/musredit_qt5/forms/PPrefsDialog.ui b/src/musredit_qt5/forms/PPrefsDialog.ui index 8f78eaa4..e6696cb4 100644 --- a/src/musredit_qt5/forms/PPrefsDialog.ui +++ b/src/musredit_qt5/forms/PPrefsDialog.ui @@ -45,7 +45,7 @@ 10 10 421 - 25 + 35 @@ -74,6 +74,19 @@ + + + + 10 + 50 + 421 + 31 + + + + Change Default Search Paths + + @@ -121,9 +134,9 @@ - 170 + 190 10 - 171 + 241 23 @@ -134,9 +147,9 @@ - 170 + 190 35 - 191 + 241 22 @@ -147,9 +160,9 @@ - 170 + 190 60 - 161 + 241 22 @@ -167,7 +180,7 @@ 10 10 - 141 + 421 22 @@ -180,7 +193,7 @@ 10 40 - 231 + 421 21 diff --git a/src/tests/MeissnerNonMuSR/PMeissnerNonMuSRLinkDef.h b/src/tests/MeissnerNonMuSR/PMeissnerNonMuSRLinkDef.h index 5e9674b4..f2dfe2c9 100644 --- a/src/tests/MeissnerNonMuSR/PMeissnerNonMuSRLinkDef.h +++ b/src/tests/MeissnerNonMuSR/PMeissnerNonMuSRLinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/tests/MuTransition/Makefile.PSimulateMuTransition b/src/tests/MuTransition/Makefile.PSimulateMuTransition index f6e8fc0e..d275bdc5 100644 --- a/src/tests/MuTransition/Makefile.PSimulateMuTransition +++ b/src/tests/MuTransition/Makefile.PSimulateMuTransition @@ -97,4 +97,6 @@ install: all ifeq ($(OS),LINUX) cp -pv $(SHLIB) $(ROOTSYS)/lib cp -pv PSimulateMuTransition.h $(ROOTSYS)/include +# for root6 + cp -pv PSimulateMuTransitionDict_rdict.pcm $(ROOTSYS)/lib endif diff --git a/src/tests/MuTransition/PSimulateMuTransitionLinkDef.h b/src/tests/MuTransition/PSimulateMuTransitionLinkDef.h index 1538a7ee..25fc0db3 100644 --- a/src/tests/MuTransition/PSimulateMuTransitionLinkDef.h +++ b/src/tests/MuTransition/PSimulateMuTransitionLinkDef.h @@ -28,7 +28,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/tests/analyticFakeData/PAddPoissonNoiseLinkDef.h b/src/tests/analyticFakeData/PAddPoissonNoiseLinkDef.h index 61fa0414..10eb2b10 100644 --- a/src/tests/analyticFakeData/PAddPoissonNoiseLinkDef.h +++ b/src/tests/analyticFakeData/PAddPoissonNoiseLinkDef.h @@ -29,7 +29,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/tests/canvasMenu/PMyCanvasLinkDef.h b/src/tests/canvasMenu/PMyCanvasLinkDef.h index d40a8294..eb52ca0b 100644 --- a/src/tests/canvasMenu/PMyCanvasLinkDef.h +++ b/src/tests/canvasMenu/PMyCanvasLinkDef.h @@ -29,7 +29,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/tests/eventHandler/PEventHandlerTestLinkDef.h b/src/tests/eventHandler/PEventHandlerTestLinkDef.h index 4eafaa8d..5013d0a7 100644 --- a/src/tests/eventHandler/PEventHandlerTestLinkDef.h +++ b/src/tests/eventHandler/PEventHandlerTestLinkDef.h @@ -29,7 +29,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/tests/spirit/PFunctionHandler.h b/src/tests/spirit/PFunctionHandler.h index 22bda960..d3cf1bde 100644 --- a/src/tests/spirit/PFunctionHandler.h +++ b/src/tests/spirit/PFunctionHandler.h @@ -71,7 +71,7 @@ class PFunctionHandler }; // cint dictionary stuff -------------------------------------- -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; @@ -79,7 +79,7 @@ class PFunctionHandler #pragma link C++ class PFunctionHandler+; -#endif // end __CINT__ +#endif // end __CLING__ //------------------------------------------------------------- #endif // _PFUNCTIONHANDLER_H_ diff --git a/src/tests/userFcn/TUserFcnBaseLinkDef.h b/src/tests/userFcn/TUserFcnBaseLinkDef.h index 4a809e9c..7d9408b4 100644 --- a/src/tests/userFcn/TUserFcnBaseLinkDef.h +++ b/src/tests/userFcn/TUserFcnBaseLinkDef.h @@ -29,7 +29,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/tests/userFcn/TUserFcnLinkDef.h b/src/tests/userFcn/TUserFcnLinkDef.h index 5c58e639..568f0190 100644 --- a/src/tests/userFcn/TUserFcnLinkDef.h +++ b/src/tests/userFcn/TUserFcnLinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/tests/userFcnGlobal/PRelaxLinkDef.h b/src/tests/userFcnGlobal/PRelaxLinkDef.h index 038e11f7..70ea2213 100644 --- a/src/tests/userFcnGlobal/PRelaxLinkDef.h +++ b/src/tests/userFcnGlobal/PRelaxLinkDef.h @@ -1,4 +1,4 @@ -#ifdef __CINT__ +#ifdef __CLING__ #pragma link off all globals; #pragma link off all classes;