Merge pull request #39137 from smuzaffar/lto-DWM-HLTEvF

[LTO] Fix ODR warning for DQM/HLTEvF
cms-sw · Aug 23, 2022 · 6511989 · 6511989
2 parents 4d9cc57 + 9d16f81
commit 6511989
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/DQM/HLTEvF/plugins/PSMonitorClient.cc b/DQM/HLTEvF/plugins/PSMonitorClient.cc
@@ -20,7 +20,7 @@
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
 
-struct MEPSet {
+struct MEPSetData {
   std::string name;
   std::string folder;
 };
@@ -34,7 +34,7 @@ class PSMonitorClient : public DQMEDHarvester {
   static void fillMePSetDescription(edm::ParameterSetDescription &pset);
 
 private:
-  static MEPSet getHistoPSet(edm::ParameterSet pset);
+  static MEPSetData getHistoPSet(edm::ParameterSet pset);
 
   std::string m_dqm_path;
 
@@ -46,15 +46,15 @@ class PSMonitorClient : public DQMEDHarvester {
 
   void check(DQMStore::IBooker &booker, DQMStore::IGetter &getter);
 
-  MEPSet psColumnVSlumiPSet;
+  MEPSetData psColumnVSlumiPSet;
 };
 
 PSMonitorClient::PSMonitorClient(edm::ParameterSet const &config)
     : m_dqm_path(config.getUntrackedParameter<std::string>("dqmPath")),
       psColumnVSlumiPSet(getHistoPSet(config.getParameter<edm::ParameterSet>("me"))) {}
 
-MEPSet PSMonitorClient::getHistoPSet(edm::ParameterSet pset) {
-  return MEPSet{
+MEPSetData PSMonitorClient::getHistoPSet(edm::ParameterSet pset) {
+  return MEPSetData{
       pset.getParameter<std::string>("name"),
       pset.getParameter<std::string>("folder"),
   };