From 95b1982970457e497201271ffc91d97783dd66bd Mon Sep 17 00:00:00 2001
From: Jonas Rembser <jonas.rembser@cern.ch>
Date: Sat, 20 Aug 2022 15:42:07 +0200
Subject: [PATCH] Fix gcc compiler warnings

Fix various warnings related to unused typedefs, wrong deallocators,
using `*` for booleans, etc.
---
 src/BayesianToyMC.cc    | 2 +-
 src/CascadeMinimizer.cc | 2 +-
 src/HybridNew.cc        | 1 -
 src/MultiDimFit.cc      | 2 +-
 src/th1fmorph.cc        | 7 +++++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/BayesianToyMC.cc b/src/BayesianToyMC.cc
index bf2f44bc63c..0ed70e2da71 100644
--- a/src/BayesianToyMC.cc
+++ b/src/BayesianToyMC.cc
@@ -194,7 +194,7 @@ std::pair<double,double> BayesianToyMC::priorPredictiveDistribution(RooStats::Mo
         if (verbose > 2) { std::cout << "\n\n==== POINT "<< t << ","<<i<<" ====" << std::endl; params->Print("V"); }
         double nllVal = nll->getVal();
         if (offset) { 
-            if (isnan(*offset)) *offset = nllVal; 
+            if (std::isnan(*offset)) *offset = nllVal; 
             nllVal -= *offset; 
         }
         if (verbose > 1) std::cout << "nll[" << t << ","<<i<<"] = " << nllVal << ", p = " << std::exp(-nllVal) << std::endl;
diff --git a/src/CascadeMinimizer.cc b/src/CascadeMinimizer.cc
index bf043aa7673..6dfb17ce276 100644
--- a/src/CascadeMinimizer.cc
+++ b/src/CascadeMinimizer.cc
@@ -598,7 +598,7 @@ bool CascadeMinimizer::multipleMinimize(const RooArgSet &reallyCleanParameters,
 	     for (std::vector<int>::iterator it = cit.begin();
 	         it!=cit.end(); it++){
 
-		 isValidCombo *= (contributingIndeces)[pdfIndex][*it];
+		 isValidCombo &= (contributingIndeces)[pdfIndex][*it];
 		 if (!isValidCombo ) /*&& runShortCombinations)*/ continue;
 
 	     	 fPdf = (RooCategory*) pdfCategoryIndeces.at(pdfIndex);
diff --git a/src/HybridNew.cc b/src/HybridNew.cc
index d859c23c19e..96373f080e0 100644
--- a/src/HybridNew.cc
+++ b/src/HybridNew.cc
@@ -1631,7 +1631,6 @@ void HybridNew::updateGridDataFC(RooWorkspace *w, RooStats::ModelConfig *mc_s, R
 }
 
 std::pair<double,double> HybridNew::updateGridPoint(RooWorkspace *w, RooStats::ModelConfig *mc_s, RooStats::ModelConfig *mc_b, RooAbsData &data, std::map<double, RooStats::HypoTestResult *>::iterator point) {
-    typedef std::pair<double,double> CLs_t;
     bool isProfile = (testStat_ == "LHC" || testStat_ == "LHCFC"  || testStat_ == "Profile");
     if (point->first == 0 && CLs_) return std::pair<double,double>(1,0);
     RooArgSet  poi(*mc_s->GetParametersOfInterest());
diff --git a/src/MultiDimFit.cc b/src/MultiDimFit.cc
index bc472b8c299..58048423ca9 100644
--- a/src/MultiDimFit.cc
+++ b/src/MultiDimFit.cc
@@ -1230,7 +1230,7 @@ void MultiDimFit::splitGridPoints(const std::string& s, std::vector<unsigned int
     boost::split(strPoints, s, boost::is_any_of(","));
 
     // convert to int and add
-    for (const auto strPoint : strPoints) {
+    for (const auto& strPoint : strPoints) {
         points.push_back(std::stoul(strPoint));
     }
 }
diff --git a/src/th1fmorph.cc b/src/th1fmorph.cc
index 7ca06bc66ca..7858d016803 100644
--- a/src/th1fmorph.cc
+++ b/src/th1fmorph.cc
@@ -477,8 +477,11 @@ TH1_t *th1fmorph_(const char *chname,
   
   //......Clean up the temporary arrays we allocated.
 
-  delete sigdis1; delete sigdis2; 
-  delete sigdisn; delete xdisn; delete sigdisf;
+  delete[] sigdis1;
+  delete[] sigdis2;
+  delete[] sigdisn;
+  delete[] xdisn;
+  delete[] sigdisf;
 
   //......All done, return the result.