Merge pull request #25553 from Dr15Jones/clangHLTriggerHLTcore

Removed std::move from HLTConfigData to allow better compiler optimization
cms-sw · Jan 8, 2019 · 6e57f4e · 6e57f4e
2 parents 5c8de5c + f1cfcf5
commit 6e57f4e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/HLTrigger/HLTcore/src/HLTConfigData.cc b/HLTrigger/HLTcore/src/HLTConfigData.cc
@@ -18,7 +18,7 @@
 static const edm::ParameterSet initializeDummyPSet() {
   edm::ParameterSet dummy;
   dummy.registerIt();
-  return std::move(dummy);
+  return dummy;
 }
 
 static const edm::ParameterSet* s_dummyPSet()
@@ -216,7 +216,7 @@ void HLTConfigData::extract()
    } else if ( processPSet_->existsAs<ParameterSet>(preT,true)) {
      prescaleName=preT;
    }
-   if (prescaleName=="") {
+   if (prescaleName.empty()) {
      hltPrescaleTable_=HLTPrescaleTable();
    } else {
      const ParameterSet& iPS(processPSet_->getParameterSet(prescaleName));