Dictionary (classes*h) must have unique namespace or/and struct name

The patch does minor cleanups and create unique namespaces based on package name. The change is needed for ROOT6 as classes*h files becomes a payload embedded into ROOT6 dictionary, which is executed in an interpreter (Cling) during dictionary loading procedure. Signed-off-by: David Abdurachmanov <David.Abdurachmanov@cern.ch>
boudoul · Nov 22, 2013 · 05efc77 · 05efc77
1 parent 0491195
commit 05efc77
Show file tree

Hide file tree

Showing 182 changed files with 224 additions and 248 deletions.
diff --git a/Alignment/LaserAlignment/src/classes.h b/Alignment/LaserAlignment/src/classes.h
@@ -1,7 +1,7 @@
 #include "Alignment/LaserAlignment/interface/TsosVectorCollection.h"
 #include "DataFormats/Common/interface/Wrapper.h"
 
-namespace {
+namespace Alignment_LaserAlignment {
   struct dictionary {
     TsosVectorCollection tsosesColl;
     edm::Wrapper<TsosVectorCollection> tsosesWrappedColl;

diff --git a/AnalysisDataFormats/EWK/src/classes.h b/AnalysisDataFormats/EWK/src/classes.h
@@ -20,7 +20,7 @@
 #include <map>
 
 
-namespace {
+namespace AnalysisDataFormats_EWK {
   struct dictionary {
      std::vector<reco::WMuNuCandidate> v1;
      edm::Wrapper<std::vector<reco::WMuNuCandidate> > c1;

diff --git a/AnalysisDataFormats/Egamma/src/classes.h b/AnalysisDataFormats/Egamma/src/classes.h
@@ -3,10 +3,8 @@
 #include "AnalysisDataFormats/Egamma/interface/ElectronIDAssociation.h"
 #include "DataFormats/Common/interface/RefToBase.h"
 
-namespace
-{
-   struct dictionary
-   {
+namespace AnalysisDataFormats_Egamma {
+   struct dictionary {
       reco::ElectronIDCollection c1;
       edm::Wrapper<reco::ElectronIDCollection> w1;
       edm::Ref<reco::ElectronIDCollection> r1;

diff --git a/AnalysisDataFormats/SUSYBSMObjects/src/classes.h b/AnalysisDataFormats/SUSYBSMObjects/src/classes.h
@@ -4,8 +4,7 @@
 #include "AnalysisDataFormats/SUSYBSMObjects/interface/HSCPDeDxInfo.h"
 #include "AnalysisDataFormats/SUSYBSMObjects/interface/MuonSegment.h"
 
-namespace {
- namespace {
+namespace AnalysisDataFormats_SUSYBSMObjects {
   susybsm::HSCParticle pa;
 /*  susybsm::DriftTubeTOF dtitof;
 
@@ -66,7 +65,4 @@ namespace {
   edm::Wrapper<susybsm::HSCPDeDxInfo> hscpDEDXW;
   edm::Wrapper<susybsm::HSCPDeDxInfoCollection> hscpDEDXcW;
   edm::Wrapper<susybsm::HSCPDeDxInfoValueMap> hscpDEDXvmW;
-
-
- }
 }
diff --git a/AnalysisDataFormats/TopObjects/src/classes.h b/AnalysisDataFormats/TopObjects/src/classes.h
@@ -15,7 +15,7 @@
 #include "DataFormats/Common/interface/Wrapper.h"
 #include "TString.h"
 
-namespace {
+namespace AnalysisDataFormats_TopObjects {
   struct dictionary {
     TtGenEvent ttgen;
     StGenEvent stgen;

diff --git a/AnalysisDataFormats/TrackInfo/src/classes.h b/AnalysisDataFormats/TrackInfo/src/classes.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 
-namespace {
+namespace AnalysisDataFormats_TrackInfo {
   struct dictionary {
 
     reco::TrackingStateInfo                 tsi;

diff --git a/CondCore/ORA/test/classes.h b/CondCore/ORA/test/classes.h
@@ -1416,16 +1416,18 @@ class SH {
 
 }  // namespace testORA
 
-namespace {
-  std::vector<double>::iterator dummy1;
-  std::vector<int>::iterator dummy2;
-  std::vector<int16_t>::iterator dummy3;
-  std::vector<short>::iterator dummy4;
-  std::vector<float>::iterator dummy5;
-  std::vector<testORA::Entry>::iterator dummy6;
-  std::vector<testORA::SiStripNoises::DetRegistry>::iterator dummy7;
-  std::vector<std::vector<double> >::iterator dummy8;
-  std::pair<size_t,testORA::SM> dummy9;
+namespace CondCore_ORA {
+  struct dictionary {
+    std::vector<double>::iterator dummy1;
+    std::vector<int>::iterator dummy2;
+    std::vector<int16_t>::iterator dummy3;
+    std::vector<short>::iterator dummy4;
+    std::vector<float>::iterator dummy5;
+    std::vector<testORA::Entry>::iterator dummy6;
+    std::vector<testORA::SiStripNoises::DetRegistry>::iterator dummy7;
+    std::vector<std::vector<double> >::iterator dummy8;
+    std::pair<size_t,testORA::SM> dummy9;
+  };
 }
 
 #endif
diff --git a/CondCore/RegressionTest/test/classes.h b/CondCore/RegressionTest/test/classes.h
@@ -1,6 +1,6 @@
 
 #include "CondCore/RegressionTest/interface/RegressionTestPayload.h"
-namespace {
+namespace CondCore_RegressionTest {
 	struct dictionary {
 	  std::vector<double>::iterator dummy1;
 	  std::vector<int>::iterator dummy2;

diff --git a/CondCore/Utilities/src/classes.h b/CondCore/Utilities/src/classes.h
@@ -1,7 +1,7 @@
 #include "CondCore/Utilities/interface/CondBasicIter.h"
 #include <iostream>
 
-namespace {
+namespace CondCore_Utilities {
   struct dictionary {
   };
 }

diff --git a/CondFormats/BTauObjects/src/classes.h b/CondFormats/BTauObjects/src/classes.h
@@ -6,7 +6,7 @@
 #include "CondFormats/BTauObjects/interface/CombinedTauTagCalibration.h"
 
 
-namespace {
+namespace CondFormats_BTauObjects {
   struct dictionary {
     std::vector<float> b1;
 

diff --git a/CondFormats/CSCObjects/src/classes.h b/CondFormats/CSCObjects/src/classes.h
@@ -22,7 +22,7 @@
 #include "CondFormats/CSCObjects/interface/CSCDBGasGainCorrection.h"
 
 
-namespace {
+namespace CondFormats_CSCObjects {
   struct dictionary {
 
     std::vector<CSCPedestals::Item>   pedcontainer1;

diff --git a/CondFormats/Calibration/src/classes.h b/CondFormats/Calibration/src/classes.h
@@ -15,7 +15,7 @@
 #include "CondFormats/Calibration/interface/Conf.h"
 #include "CondFormats/Calibration/interface/big.h"
 
-namespace {
+namespace CondFormats_Calibration {
   struct dictionary {
     fixedArray<unsigned short,2097> d;
     std::map<std::string, Algo> e;

diff --git a/CondFormats/CastorObjects/src/classes.h b/CondFormats/CastorObjects/src/classes.h
@@ -13,7 +13,7 @@
 #include "CondFormats/CastorObjects/interface/CastorSaturationCorr.h"
 #include "CondFormats/CastorObjects/interface/CastorSaturationCorrs.h"
 
-namespace {
+namespace CondFormats_CastorObjects {
   struct dictionary {
     CastorPedestals mypeds;
     std::vector<CastorPedestal> mypedsVec;

diff --git a/CondFormats/Common/src/classes.h b/CondFormats/Common/src/classes.h
@@ -12,25 +12,17 @@
 
 #include <vector>
 
-namespace {
-  namespace {
-    struct dictionaries {
-    };
-
-    struct Dummy {
-         std::map<unsigned long long,unsigned long long> dummyForTests;
-         std::map<unsigned long long,unsigned long long>::value_type dummyForTest2;
+namespace CondFormats_Common {
+    struct dictionary {
+      std::map<unsigned long long,unsigned long long> dummyForTests;
+      std::map<unsigned long long,unsigned long long>::value_type dummyForTest2;
 
       DropBoxMetadata::Parameters aparam;
       std::pair<std::string, DropBoxMetadata::Parameters> apair1;
       std::pair<const std::basic_string<char>, DropBoxMetadata::Parameters> apair2;
 
       std::map<std::string, DropBoxMetadata::Parameters> amap1;
       std::map<const std::basic_string<char>, DropBoxMetadata::Parameters> amap2;
-
     };
-
-  }
-
 }
 
diff --git a/CondFormats/DQMObjects/src/classes.h b/CondFormats/DQMObjects/src/classes.h
@@ -2,7 +2,7 @@
 #include "CondFormats/DQMObjects/interface/HDQMSummary.h"
 
 
-namespace {
+namespace CondFormats_DQMObjects {
   struct dictionary { 
 
   std::vector<std::string>::iterator tmp30;

diff --git a/CondFormats/DTObjects/src/classes.h b/CondFormats/DTObjects/src/classes.h
@@ -27,7 +27,7 @@
 #include "CondFormats/DTObjects/interface/DTKeyedConfig.h"
 #include "CondFormats/DTObjects/interface/DTTPGParameters.h"
 
-namespace {
+namespace CondFormats_DTObjects {
   struct dictionary {
 //    std::pair<           DTT0Id,           DTT0Data>          t0Pair;
     std::pair<        DTTtrigId,        DTTtrigData>       tTrigPair;
@@ -79,7 +79,7 @@ namespace {
 
 /*
 // wrapper declarations
-namespace {
+namespace CondFormats_DTObjects {
    struct wrappers {
       pool::Ptr<DTReadOutMapping >          pMap;
       cond::DataWrapper<DTReadOutMapping > dwMap;

diff --git a/CondFormats/ESObjects/src/classes.h b/CondFormats/ESObjects/src/classes.h
@@ -20,7 +20,7 @@
 #include "CondFormats/ESObjects/interface/ESRecHitRatioCuts.h"
 #include "CondFormats/ESObjects/interface/ESTimeSampleWeights.h"
 
-namespace{
+namespace CondFormats_ESObjects {
   struct dictionary {
 
     ESCondObjectContainer<ESPedestal> ESPedestalsMap;

diff --git a/CondFormats/EcalObjects/src/classes.h b/CondFormats/EcalObjects/src/classes.h
@@ -62,7 +62,7 @@
 
 
 
-namespace{
+namespace CondFormats_EcalObjects {
   struct dictionary {
 
     std::vector<EcalChannelStatusCode> v_ecalChannelStatusCode;

diff --git a/CondFormats/EgammaObjects/src/classes.h b/CondFormats/EgammaObjects/src/classes.h
@@ -6,7 +6,7 @@
 #include "CondFormats/EgammaObjects/interface/GBRTree2D.h"
 #include "CondFormats/EgammaObjects/interface/GBRForest2D.h"
 
-namespace {
+namespace CondFormats_EgammaObjects {
   struct dictionary {
     ElectronLikelihoodCategoryData a;
 

diff --git a/CondFormats/HIObjects/src/classes.h b/CondFormats/HIObjects/src/classes.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-namespace {  
+namespace CondFormats_HIObjects {
   struct dictionary{
     std::vector<CentralityTable::CBin> dummy;
     std::vector<RPFlatParams::EP> yummy;

diff --git a/CondFormats/HcalObjects/src/classes.h b/CondFormats/HcalObjects/src/classes.h
@@ -2,7 +2,7 @@
 
 #include "CondFormats/HcalObjects/interface/AllObjects.h"
 
-namespace {
+namespace CondFormats_HcalObjects {
   struct dictionary {
 
     HcalPedestals mypeds();

diff --git a/CondFormats/JetMETObjects/src/classes.h b/CondFormats/JetMETObjects/src/classes.h
@@ -7,14 +7,18 @@
 #include "CondFormats/JetMETObjects/interface/FFTJetCorrectorParameters.h"
 
 #include <vector>
-
-JetCorrectorParameters corr;
-JetCorrectorParameters::Definitions def;
-JetCorrectorParameters::Record record;
-std::vector<JetCorrectorParameters> corrv;
-std::vector<JetCorrectorParameters::Record> recordv;
-JetCorrectorParametersCollection coll;
-JetCorrectorParametersCollection::pair_type pair_type;
-JetCorrectorParametersCollection::collection_type colltype;
-std::vector<JetCorrectorParametersCollection> collv;
-FFTJetCorrectorParameters fftcorr;
+
+namespace CondFormats_JetMETObjects {
+  struct dictionary {
+    JetCorrectorParameters corr;
+    JetCorrectorParameters::Definitions def;
+    JetCorrectorParameters::Record record;
+    std::vector<JetCorrectorParameters> corrv;
+    std::vector<JetCorrectorParameters::Record> recordv;
+    JetCorrectorParametersCollection coll;
+    JetCorrectorParametersCollection::pair_type pair_type;
+    JetCorrectorParametersCollection::collection_type colltype;
+    std::vector<JetCorrectorParametersCollection> collv;
+    FFTJetCorrectorParameters fftcorr;
+  };
+}
diff --git a/CondFormats/L1TObjects/src/classes.h b/CondFormats/L1TObjects/src/classes.h
@@ -44,7 +44,7 @@
 #include "CondFormats/L1TObjects/interface/L1RPCHsbConfig.h"
 
 
-namespace {
+namespace CondFormats_L1TObjects {
   struct dictionary {
     std::vector<L1MuDTExtLut::LUT> dummy3 ;
     std::vector<L1GtMuonTemplate> dummy4 ;

diff --git a/CondFormats/Luminosity/src/classes.h b/CondFormats/Luminosity/src/classes.h
@@ -1,6 +1,9 @@
 #include "CondFormats/Luminosity/interface/LumiSectionData.h"
-namespace {
+
+namespace CondFormats_Luminosity {
+  struct dictionary {
     std::vector<lumi::BunchCrossingInfo>::iterator tmp1;
     std::vector<lumi::HLTInfo>::iterator tmp2;
     std::vector<lumi::TriggerInfo>::iterator tmp3;
+  };
 }
diff --git a/CondFormats/OptAlignObjects/src/classes.h b/CondFormats/OptAlignObjects/src/classes.h
@@ -32,7 +32,7 @@
 //template std::vector< PXsensors::Item >::const_iterator;
 //template edm::Wrapper<OpticalAlignments>;
 
-namespace{
+namespace CondFormats_OptAlignObjects {
   struct dictionary {
     std::vector<OpticalAlignInfo> optaligninfovec;
     std::vector<MBAChBenchCalPlateData> mbacalvec;

diff --git a/CondFormats/PhysicsToolsObjects/src/classes.h b/CondFormats/PhysicsToolsObjects/src/classes.h
@@ -14,7 +14,7 @@
 #include "CondFormats/PhysicsToolsObjects/interface/PhysicsTFormulaPayload.h"
 
 
-namespace { // anonymous
+namespace CondFormats_PhysicsToolsObjects { // anonymous
 struct dictionary {
 
 #ifdef STD_DICTIONARIES_STUFF_MISSING

diff --git a/CondFormats/RPCObjects/src/classes.h b/CondFormats/RPCObjects/src/classes.h
@@ -32,7 +32,7 @@
 #include "CondFormats/RPCObjects/interface/RPCObGasMix.h"
 #include "CondFormats/RPCObjects/interface/RPCObGasHum.h"
 
-namespace{
+namespace CondFormats_RPCObjects {
   struct dictionary {
     std::vector<ChamberStripSpec> theStrips;
 

diff --git a/CondFormats/RecoMuonObjects/src/classes.h b/CondFormats/RecoMuonObjects/src/classes.h
@@ -1,6 +1,6 @@
 #include "CondFormats/RecoMuonObjects/interface/MuScleFitDBobject.h"
 
-namespace {
+namespace CondFormats_RecoMuonObjects {
   struct dictionary {
     // std::vector<PhysicsTools::Calibration::HistogramD2D> a;
     MuScleFitDBobject e;

diff --git a/CondFormats/RunInfo/src/classes.h b/CondFormats/RunInfo/src/classes.h
@@ -4,7 +4,7 @@
 #include "CondFormats/RunInfo/interface/L1TriggerScaler.h"
 #include "CondFormats/RunInfo/interface/MixingModuleConfig.h"
 #include "CondFormats/RunInfo/interface/FillInfo.h"
-namespace {
+namespace CondFormats_RunInfo {
   struct dictionary {
     std::vector<runinfo_test::RunNumber::Item>::iterator tmp0;
     std::vector<L1TriggerScaler::Lumi>::iterator tmp1;

diff --git a/CondFormats/SiPixelObjects/src/classes.h b/CondFormats/SiPixelObjects/src/classes.h
@@ -16,7 +16,7 @@ template class PixelDCSObject<bool>;
 template class PixelDCSObject<float>;
 template class PixelDCSObject<CaenChannel>;
 
-namespace {
+namespace CondFormats_SiPixelObjects {
   struct dictionary {
     std::map<SiPixelFedCablingMap::Key, sipixelobjects::PixelROC> theMap; 
     std::pair<const SiPixelFedCablingMap::Key, sipixelobjects::PixelROC> theMapValueT; 

diff --git a/CondFormats/SiStripObjects/src/classes.h b/CondFormats/SiStripObjects/src/classes.h
@@ -14,7 +14,7 @@
 #include "CondFormats/SiStripObjects/interface/SiStripSummary.h"
 #include "CondFormats/SiStripObjects/interface/SiStripConfObject.h"
 
-namespace {
+namespace CondFormats_SiStripObjects {
   struct dictionary {
     std::vector< std::vector<FedChannelConnection> > tmp1;
 

diff --git a/CondTools/Utilities/test/classes.h b/CondTools/Utilities/test/classes.h
@@ -14,7 +14,7 @@
 
 #include <iostream>
 
-namespace {
+namespace CondTools_Utilities {
   struct dictionary {
 
     CondCachedIter<Pedestals> dummy0;

diff --git a/DPGAnalysis/SiStripTools/src/classes.h b/DPGAnalysis/SiStripTools/src/classes.h
@@ -8,7 +8,7 @@
 
 #include "DataFormats/Common/interface/Wrapper.h"
 
-namespace { 
+namespace DPGAnalysis_SiStripTools {
   struct dictionary {
     TinyEventCollection dummycoll;
     SingleSiStripDigiMultiplicity dummy1;

diff --git a/DQM/SiPixelHistoricInfoClient/interface/classes.h b/DQM/SiPixelHistoricInfoClient/interface/classes.h
@@ -2,7 +2,7 @@
 
 #include "DQM/SiPixelHistoricInfoClient/interface/HDQMInspectorConfigSiPixel.h"
 
-namespace {
+namespace DQM_SiPixelHistoricInfoClient {
   struct dictionary {
     HDQMInspectorConfigSiPixel RealDummyDum;
   };

diff --git a/DQM/SiStripHistoricInfoClient/interface/classes.h b/DQM/SiStripHistoricInfoClient/interface/classes.h
@@ -3,7 +3,7 @@
 #include "DQM/SiStripHistoricInfoClient/interface/HDQMInspectorConfigSiStrip.h"
 #include "DQM/SiStripHistoricInfoClient/interface/HDQMInspectorConfigTracking.h"
 
-namespace {
+namespace DQM_SiStripHistoricInfoClient {
   struct dictionary {
     HDQMInspectorConfigSiStrip dummy1;
     HDQMInspectorConfigTracking dummy2;