Merge pull request #22426 from gartung/CalibFormats-CalibMuon-cleanup…

…-clang-warnings CalibFormats & CalibMuon : cleanup clang warnings
cms-sw · Mar 5, 2018 · c0867ee · c0867ee
2 parents b1da330 + 218bf6e
commit c0867ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CalibFormats/SiPixelObjects/interface/PixelTrimCommon.h b/CalibFormats/SiPixelObjects/interface/PixelTrimCommon.h
@@ -44,6 +44,9 @@ namespace pos{
 
     void         writeASCII(std::string filename)                                                           const override  ;
     void         writeXML(      pos::PixelConfigKey key, int version, std::string path)                     const override {;}
+    using PixelTrimBase::writeXMLHeader;
+    using PixelTrimBase::writeXML;
+    using PixelTrimBase::writeXMLTrailer;
     void writeXMLHeader(pos::PixelConfigKey key, int version, std::string path, std::ofstream *out) const override {;}
     void writeXML(                                                              std::ofstream *out) const override {;}
     void writeXMLTrailer(                                                       std::ofstream *out) const override {;}

diff --git a/CalibMuon/DTCalibration/test/stubs/DTTimeBoxPlotter.cc b/CalibMuon/DTCalibration/test/stubs/DTTimeBoxPlotter.cc
@@ -170,7 +170,7 @@ TCanvas * DTTimeBoxPlotter::newCanvas(TString name, TString title,
 				    int xdiv, int ydiv, int form, int w){
   static int i = 1;
   if (name == "") {
-    name = TString("Canvas "+i);
+    name = TString("Canvas ") + TString(i);
     i++;
   }
   TCanvas *c = 0;