Merge pull request #17227 from davidlt/TString-cxx17-pat-reco

Use static_cast to call explicitly conversion operator on TString
cms-sw · Jan 20, 2017 · 3edc2e2 · 3edc2e2
2 parents 4a12ea8 + 1ff068c
commit 3edc2e2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/PhysicsTools/RecoUtils/plugins/TriggerVariables.h b/PhysicsTools/RecoUtils/plugins/TriggerVariables.h
@@ -66,7 +66,7 @@ class HLTBitComputer : public VariableComputer {
     for (unsigned int iT=0;iT!=validTriggerNames_.size();++iT){
       TString tname(validTriggerNames_[iT]);
       tname.ReplaceAll("HLT_","");//remove the "HLT_" prefix
-      declare(std::string(tname), iC);
+      declare(std::string(static_cast<const char *>(tname)), iC);
     }
   }
     ~HLTBitComputer(){}
@@ -80,7 +80,7 @@ class HLTBitComputer : public VariableComputer {
 	TString tname(validTriggerNames_[iT]);
 	tname.ReplaceAll("HLT_","");
 	double r=trh->accept(triggerNames.triggerIndex(validTriggerNames_[iT]));
-	assign(std::string(tname),r);
+	assign(std::string(static_cast<const char *>(tname)),r);
       }
 
     }