From 08b916eae8942e82b5bc79a04b68911f3ed83128 Mon Sep 17 00:00:00 2001
From: moneta <lorenzo.moneta@cern.ch>
Date: Tue, 29 May 2018 15:03:39 +0200
Subject: [PATCH] Fix compiler warning
---
hist/hist/inc/TH1.h | 2 +-
hist/hist/src/TH1Merger.cxx | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/hist/hist/inc/TH1.h b/hist/hist/inc/TH1.h
index 342df43c31d..68bdc6d33c6 100644
--- a/hist/hist/inc/TH1.h
+++ b/hist/hist/inc/TH1.h
@@ -335,7 +335,7 @@ public:
virtual void LabelsInflate(Option_t *axis="X");
virtual void LabelsOption(Option_t *option="h", Option_t *axis="X");
virtual Long64_t Merge(TCollection *list) { return Merge(list,""); }
- virtual Long64_t Merge(TCollection *list, Option_t * option);
+ Long64_t Merge(TCollection *list, Option_t * option);
virtual Bool_t Multiply(TF1 *f1, Double_t c1=1);
virtual Bool_t Multiply(const TH1 *h1);
virtual Bool_t Multiply(const TH1 *h1, const TH1 *h2, Double_t c1=1, Double_t c2=1, Option_t *option=""); // *MENU*
diff --git a/hist/hist/src/TH1Merger.cxx b/hist/hist/src/TH1Merger.cxx
index acfcc15554a..48afc660b01 100644
--- a/hist/hist/src/TH1Merger.cxx
+++ b/hist/hist/src/TH1Merger.cxx
@@ -921,15 +921,18 @@ Int_t TH1Merger::CheckForDuplicateLabels(const TH1 * hist) {
Int_t res = 0;
if (HasDuplicateLabels(labelsX) ) {
- Warning("TH1Merger::CheckForDuplicateLabels","Histogram %s has duplicate labels in the x axis",hist->GetName());
+ Warning("TH1Merger::CheckForDuplicateLabels","Histogram %s has duplicate labels in the x axis. "
+ "Bin contents will be merged in a single bin",hist->GetName());
res |= 1;
}
if (HasDuplicateLabels(labelsY) ) {
- Warning("TH1Merger::CheckForDuplicateLabels","Histogram %s has duplicate labels in the y axis",hist->GetName());
+ Warning("TH1Merger::CheckForDuplicateLabels","Histogram %s has duplicate labels in the y axis. "
+ "Bin contents will be merged in a single bin",hist->GetName());
res |= 2;
}
if (HasDuplicateLabels(labelsZ) ) {
- Warning("TH1Merger::CheckForDuplicateLabels","Histogram %s has duplicate labels in the z axis",hist->GetName());
+ Warning("TH1Merger::CheckForDuplicateLabels","Histogram %s has duplicate labels in the z axis. "
+ "Bin contents will be merged in a single bin",hist->GetName());
res |= 4;
}
return res;
--
GitLab