From 05efc77a47fd301dd47e6aa37dac7a4bb71111fc Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Mon, 28 Oct 2013 23:34:37 +0100 Subject: [PATCH] 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 --- Alignment/LaserAlignment/src/classes.h | 2 +- AnalysisDataFormats/EWK/src/classes.h | 2 +- AnalysisDataFormats/Egamma/src/classes.h | 6 ++--- .../SUSYBSMObjects/src/classes.h | 6 +---- AnalysisDataFormats/TopObjects/src/classes.h | 2 +- AnalysisDataFormats/TrackInfo/src/classes.h | 2 +- CondCore/ORA/test/classes.h | 22 +++++++++------- CondCore/RegressionTest/test/classes.h | 2 +- CondCore/Utilities/src/classes.h | 2 +- CondFormats/BTauObjects/src/classes.h | 2 +- CondFormats/CSCObjects/src/classes.h | 2 +- CondFormats/Calibration/src/classes.h | 2 +- CondFormats/CastorObjects/src/classes.h | 2 +- CondFormats/Common/src/classes.h | 16 +++--------- CondFormats/DQMObjects/src/classes.h | 2 +- CondFormats/DTObjects/src/classes.h | 4 +-- CondFormats/ESObjects/src/classes.h | 2 +- CondFormats/EcalObjects/src/classes.h | 2 +- CondFormats/EgammaObjects/src/classes.h | 2 +- CondFormats/HIObjects/src/classes.h | 2 +- CondFormats/HcalObjects/src/classes.h | 2 +- CondFormats/JetMETObjects/src/classes.h | 26 +++++++++++-------- CondFormats/L1TObjects/src/classes.h | 2 +- CondFormats/Luminosity/src/classes.h | 5 +++- CondFormats/OptAlignObjects/src/classes.h | 2 +- CondFormats/PhysicsToolsObjects/src/classes.h | 2 +- CondFormats/RPCObjects/src/classes.h | 2 +- CondFormats/RecoMuonObjects/src/classes.h | 2 +- CondFormats/RunInfo/src/classes.h | 2 +- CondFormats/SiPixelObjects/src/classes.h | 2 +- CondFormats/SiStripObjects/src/classes.h | 2 +- CondTools/Utilities/test/classes.h | 2 +- DPGAnalysis/SiStripTools/src/classes.h | 2 +- .../interface/classes.h | 2 +- .../interface/classes.h | 2 +- DQMServices/Diagnostic/interface/classes.h | 2 +- DataFormats/Alignment/src/classes.h | 2 +- DataFormats/BTauReco/src/classes.h | 2 +- DataFormats/BeamSpot/src/classes.h | 2 +- DataFormats/CLHEP/src/classes.h | 2 +- DataFormats/CSCDigi/src/classes.h | 2 +- DataFormats/CSCRecHit/src/classes.h | 2 +- DataFormats/CaloRecHit/src/classes.h | 2 +- DataFormats/CaloTowers/src/classes.h | 2 +- DataFormats/Candidate/src/classes.h | 2 +- DataFormats/CastorReco/src/classes.h | 2 +- DataFormats/Common/src/classes.h | 2 +- DataFormats/DTDigi/src/classes.h | 2 +- DataFormats/DTRecHit/src/classes.h | 2 +- DataFormats/DetId/src/classes.h | 2 +- DataFormats/EcalDetId/src/classes.h | 2 +- DataFormats/EcalDigi/src/classes.h | 2 +- DataFormats/EcalRawData/src/classes.h | 2 +- DataFormats/EcalRecHit/src/classes.h | 4 +-- DataFormats/EgammaCandidates/src/classes.h | 2 +- DataFormats/EgammaReco/src/classes.h | 2 +- DataFormats/EgammaTrackReco/src/classes.h | 2 +- DataFormats/FEDRawData/src/classes.h | 2 +- DataFormats/FP420Cluster/src/classes.h | 6 ++--- DataFormats/FP420Digi/src/classes.h | 2 +- DataFormats/GEMDigi/src/classes.h | 2 +- DataFormats/GEMRecHit/src/classes.h | 2 +- .../GeometryCommonDetAlgo/src/classes.h | 2 +- DataFormats/GeometryVector/src/classes.h | 2 +- DataFormats/GsfTrackReco/src/classes.h | 2 +- DataFormats/HLTReco/src/classes.h | 2 +- DataFormats/HcalCalibObjects/src/classes.h | 2 +- DataFormats/HcalDetId/src/classes.h | 2 +- DataFormats/HcalDigi/src/classes.h | 2 +- DataFormats/HcalIsolatedTrack/src/classes.h | 2 +- DataFormats/HcalRecHit/src/classes.h | 2 +- DataFormats/HeavyIonEvent/src/classes.h | 2 +- DataFormats/HepMCCandidate/src/classes.h | 2 +- DataFormats/Histograms/src/classes.h | 2 +- DataFormats/JetReco/src/classes_1.h | 2 +- DataFormats/JetReco/src/classes_2.h | 2 +- DataFormats/JetReco/src/classes_3.h | 2 +- DataFormats/JetReco/src/classes_4.h | 2 +- DataFormats/L1CSCTrackFinder/src/classes.h | 2 +- DataFormats/L1CaloTrigger/src/classes.h | 2 +- DataFormats/L1DTTrackFinder/src/classes.h | 2 +- DataFormats/L1GlobalCaloTrigger/src/classes.h | 2 +- DataFormats/L1GlobalMuonTrigger/src/classes.h | 2 +- DataFormats/L1GlobalTrigger/src/classes.h | 2 +- DataFormats/L1Trigger/src/classes.h | 2 +- DataFormats/LTCDigi/src/classes.h | 2 +- DataFormats/Luminosity/src/classes.h | 2 +- DataFormats/METObjects/src/classes.h | 2 +- DataFormats/METReco/src/classes.h | 2 +- DataFormats/Math/src/classes.h | 2 +- DataFormats/MuonReco/src/classes.h | 2 +- DataFormats/MuonSeed/src/classes.h | 2 +- .../ParticleFlowCandidate/src/classes.h | 2 +- DataFormats/ParticleFlowReco/src/classes_1.h | 2 +- DataFormats/ParticleFlowReco/src/classes_2.h | 2 +- .../PatCandidates/src/classes_objects.h | 2 +- DataFormats/PatCandidates/src/classes_other.h | 2 +- .../PatCandidates/src/classes_trigger.h | 2 +- DataFormats/PatCandidates/src/classes_user.h | 2 +- DataFormats/Provenance/src/classes.h | 2 +- DataFormats/RPCDigi/src/classes.h | 2 +- DataFormats/RPCRecHit/src/classes.h | 2 +- DataFormats/RecoCandidate/src/classes.h | 2 +- DataFormats/Scalers/src/classes.h | 6 ++--- DataFormats/SiPixelCluster/src/classes.h | 2 +- DataFormats/SiPixelDigi/src/classes.h | 2 +- DataFormats/SiPixelRawData/src/classes.h | 2 +- DataFormats/SiStripCluster/src/classes.h | 6 ++--- DataFormats/SiStripCommon/src/classes.h | 4 +-- DataFormats/SiStripDigi/src/classes.h | 6 ++--- DataFormats/StdDictionaries/src/classes_map.h | 2 +- .../StdDictionaries/src/classes_others.h | 2 +- .../StdDictionaries/src/classes_pair.h | 2 +- .../StdDictionaries/src/classes_vector.h | 2 +- DataFormats/Streamer/src/classes.h | 2 +- DataFormats/TauReco/src/classes_1.h | 2 +- DataFormats/TauReco/src/classes_2.h | 2 +- DataFormats/TauReco/src/classes_3.h | 2 +- DataFormats/TauReco/src/classes_hlt.h | 2 +- DataFormats/TestObjects/src/classes.h | 2 +- DataFormats/TrackCandidate/src/classes.h | 2 +- DataFormats/TrackReco/src/classes.h | 2 +- DataFormats/TrackerCommon/src/classes.h | 2 +- DataFormats/TrackerRecHit2D/src/classes.h | 2 +- DataFormats/TrackingRecHit/src/classes.h | 2 +- DataFormats/TrackingSeed/src/classes.h | 2 +- DataFormats/TrajectorySeed/src/classes.h | 2 +- DataFormats/TrajectoryState/src/classes.h | 2 +- DataFormats/V0Candidate/src/classes.h | 2 +- DataFormats/VZero/src/classes.h | 2 +- DataFormats/VertexReco/src/classes.h | 2 +- .../WrappedStdDictionaries/src/classes.h | 2 +- FWCore/MessageLogger/src/classes.h | 2 +- .../scripts/mkTemplates/DataPkg/classes.h | 2 +- .../scripts/mkTemplates/TSelector/classes.h | 2 +- FastSimDataFormats/External/src/classes.h | 2 +- .../NuclearInteractions/src/classes.h | 2 +- FastSimDataFormats/PileUpEvents/src/classes.h | 2 +- Fireworks/Core/src/classes.h | 2 +- PhysicsTools/FWLite/src/classes.h | 2 +- PhysicsTools/IsolationUtils/src/classes.h | 2 +- PhysicsTools/MVAComputer/src/classes.h | 2 +- PhysicsTools/MVATrainer/src/classes.h | 2 +- PhysicsTools/ParallelAnalysis/src/classes.h | 2 +- PhysicsTools/PatUtils/src/classes.h | 2 +- PhysicsTools/SelectorUtils/src/classes.h | 2 +- PhysicsTools/TagAndProbe/src/classes.h | 3 --- PhysicsTools/TagAndProbe/src/classes_def.xml | 3 --- PhysicsTools/Utilities/src/classes.h | 2 +- RecoParticleFlow/PFRootEvent/src/classes.h | 2 +- .../PFRootEvent/template/src/classes.h | 2 +- RecoTracker/MeasurementDet/src/classes.h | 2 +- RecoTracker/TkSeedGenerator/src/classes.h | 2 +- SimDataFormats/CaloHit/src/classes.h | 2 +- SimDataFormats/CaloTest/src/classes.h | 2 +- SimDataFormats/CrossingFrame/src/classes.h | 2 +- SimDataFormats/DigiSimLinks/src/classes.h | 2 +- SimDataFormats/EcalTestBeam/src/classes.h | 2 +- SimDataFormats/EncodedEventId/src/classes.h | 2 +- SimDataFormats/Forward/src/classes.h | 2 +- .../GeneratorProducts/src/classes.h | 2 +- SimDataFormats/HcalTestBeam/src/classes.h | 2 +- SimDataFormats/HiGenData/src/classes.h | 2 +- SimDataFormats/JetMatching/src/classes.h | 2 +- .../PileupSummaryInfo/src/classes.h | 2 +- SimDataFormats/RPCDigiSimLink/src/classes.h | 2 +- SimDataFormats/RandomEngine/src/classes.h | 2 +- SimDataFormats/Track/src/classes.h | 2 +- .../TrackerDigiSimLink/src/classes.h | 2 +- SimDataFormats/TrackingAnalysis/src/classes.h | 6 ++--- SimDataFormats/TrackingHit/src/classes.h | 2 +- .../ValidationFormats/src/classes.h | 2 +- SimDataFormats/Vertex/src/classes.h | 2 +- SimGeneral/TrackingAnalysis/src/classes.h | 2 +- SimTracker/TrackHistory/src/classes.h | 9 +++---- .../TrackerHitAssociation/src/classes.h | 2 +- TBDataFormats/EcalTBObjects/src/classes.h | 2 +- TBDataFormats/HcalTBObjects/src/classes.h | 2 +- TrackingTools/GsfTracking/src/classes.h | 2 +- TrackingTools/PatternTools/src/classes.h | 2 +- TrackingTools/TrajectoryState/src/classes.h | 2 +- Validation/RecoParticleFlow/src/classes.h | 6 ----- 182 files changed, 224 insertions(+), 248 deletions(-) delete mode 100644 PhysicsTools/TagAndProbe/src/classes.h delete mode 100644 PhysicsTools/TagAndProbe/src/classes_def.xml diff --git a/Alignment/LaserAlignment/src/classes.h b/Alignment/LaserAlignment/src/classes.h index a64e127bb3e5d..164639740e2b6 100644 --- 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 tsosesWrappedColl; diff --git a/AnalysisDataFormats/EWK/src/classes.h b/AnalysisDataFormats/EWK/src/classes.h index 71808e6b4c193..507e8101c72b1 100644 --- a/AnalysisDataFormats/EWK/src/classes.h +++ b/AnalysisDataFormats/EWK/src/classes.h @@ -20,7 +20,7 @@ #include -namespace { +namespace AnalysisDataFormats_EWK { struct dictionary { std::vector v1; edm::Wrapper > c1; diff --git a/AnalysisDataFormats/Egamma/src/classes.h b/AnalysisDataFormats/Egamma/src/classes.h index fc7bf869fd805..3429cd87f0732 100644 --- 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 w1; edm::Ref r1; diff --git a/AnalysisDataFormats/SUSYBSMObjects/src/classes.h b/AnalysisDataFormats/SUSYBSMObjects/src/classes.h index 0753c0fecaa4b..848383b68c6ab 100644 --- 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 hscpDEDXW; edm::Wrapper hscpDEDXcW; edm::Wrapper hscpDEDXvmW; - - - } } diff --git a/AnalysisDataFormats/TopObjects/src/classes.h b/AnalysisDataFormats/TopObjects/src/classes.h index 787afdf5d9698..0dd62772b3514 100644 --- 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 index 9799a29974669..8b78fd23776f3 100755 --- a/AnalysisDataFormats/TrackInfo/src/classes.h +++ b/AnalysisDataFormats/TrackInfo/src/classes.h @@ -9,7 +9,7 @@ #include -namespace { +namespace AnalysisDataFormats_TrackInfo { struct dictionary { reco::TrackingStateInfo tsi; diff --git a/CondCore/ORA/test/classes.h b/CondCore/ORA/test/classes.h index e328a39fdda1a..b162c4485814d 100644 --- a/CondCore/ORA/test/classes.h +++ b/CondCore/ORA/test/classes.h @@ -1416,16 +1416,18 @@ class SH { } // namespace testORA -namespace { - std::vector::iterator dummy1; - std::vector::iterator dummy2; - std::vector::iterator dummy3; - std::vector::iterator dummy4; - std::vector::iterator dummy5; - std::vector::iterator dummy6; - std::vector::iterator dummy7; - std::vector >::iterator dummy8; - std::pair dummy9; +namespace CondCore_ORA { + struct dictionary { + std::vector::iterator dummy1; + std::vector::iterator dummy2; + std::vector::iterator dummy3; + std::vector::iterator dummy4; + std::vector::iterator dummy5; + std::vector::iterator dummy6; + std::vector::iterator dummy7; + std::vector >::iterator dummy8; + std::pair dummy9; + }; } #endif diff --git a/CondCore/RegressionTest/test/classes.h b/CondCore/RegressionTest/test/classes.h index 91563e49f5a36..f0b3454e20ec5 100644 --- 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::iterator dummy1; std::vector::iterator dummy2; diff --git a/CondCore/Utilities/src/classes.h b/CondCore/Utilities/src/classes.h index f0fed74c3f46d..7be2334c9287e 100644 --- a/CondCore/Utilities/src/classes.h +++ b/CondCore/Utilities/src/classes.h @@ -1,7 +1,7 @@ #include "CondCore/Utilities/interface/CondBasicIter.h" #include -namespace { +namespace CondCore_Utilities { struct dictionary { }; } diff --git a/CondFormats/BTauObjects/src/classes.h b/CondFormats/BTauObjects/src/classes.h index 93dd166ffdf9a..b71a1dae5d41f 100644 --- 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 b1; diff --git a/CondFormats/CSCObjects/src/classes.h b/CondFormats/CSCObjects/src/classes.h index 710456e50318a..4e2482bce5766 100644 --- 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 pedcontainer1; diff --git a/CondFormats/Calibration/src/classes.h b/CondFormats/Calibration/src/classes.h index 2303d6b6fc9ad..f38cbc4084c4f 100644 --- 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 d; std::map e; diff --git a/CondFormats/CastorObjects/src/classes.h b/CondFormats/CastorObjects/src/classes.h index 2039770c8d662..7a11693d76917 100644 --- 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 mypedsVec; diff --git a/CondFormats/Common/src/classes.h b/CondFormats/Common/src/classes.h index 533d8cb9a0b54..bd68a71eefa42 100644 --- a/CondFormats/Common/src/classes.h +++ b/CondFormats/Common/src/classes.h @@ -12,14 +12,10 @@ #include -namespace { - namespace { - struct dictionaries { - }; - - struct Dummy { - std::map dummyForTests; - std::map::value_type dummyForTest2; +namespace CondFormats_Common { + struct dictionary { + std::map dummyForTests; + std::map::value_type dummyForTest2; DropBoxMetadata::Parameters aparam; std::pair apair1; @@ -27,10 +23,6 @@ namespace { std::map amap1; std::map, DropBoxMetadata::Parameters> amap2; - }; - - } - } diff --git a/CondFormats/DQMObjects/src/classes.h b/CondFormats/DQMObjects/src/classes.h index 73fac1f32b166..5e8b5beddb60b 100644 --- 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::iterator tmp30; diff --git a/CondFormats/DTObjects/src/classes.h b/CondFormats/DTObjects/src/classes.h index a43b7b55cd63b..c984aff39c454 100644 --- 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 pMap; cond::DataWrapper dwMap; diff --git a/CondFormats/ESObjects/src/classes.h b/CondFormats/ESObjects/src/classes.h index d02d609613c86..7c205eb0b5a98 100644 --- 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 ESPedestalsMap; diff --git a/CondFormats/EcalObjects/src/classes.h b/CondFormats/EcalObjects/src/classes.h index f71b980f2d902..7e8e022bcdec9 100644 --- a/CondFormats/EcalObjects/src/classes.h +++ b/CondFormats/EcalObjects/src/classes.h @@ -62,7 +62,7 @@ -namespace{ +namespace CondFormats_EcalObjects { struct dictionary { std::vector v_ecalChannelStatusCode; diff --git a/CondFormats/EgammaObjects/src/classes.h b/CondFormats/EgammaObjects/src/classes.h index 127a7d6a86482..4830b56fb0bf8 100644 --- 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 index f9f9e28bd7ae0..18528fd6f36f0 100644 --- a/CondFormats/HIObjects/src/classes.h +++ b/CondFormats/HIObjects/src/classes.h @@ -3,7 +3,7 @@ #include -namespace { +namespace CondFormats_HIObjects { struct dictionary{ std::vector dummy; std::vector yummy; diff --git a/CondFormats/HcalObjects/src/classes.h b/CondFormats/HcalObjects/src/classes.h index 15d32363e0d23..629ffc5c48151 100644 --- 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 index 77e241a83745a..b8819ada47c9c 100644 --- a/CondFormats/JetMETObjects/src/classes.h +++ b/CondFormats/JetMETObjects/src/classes.h @@ -7,14 +7,18 @@ #include "CondFormats/JetMETObjects/interface/FFTJetCorrectorParameters.h" #include - -JetCorrectorParameters corr; -JetCorrectorParameters::Definitions def; -JetCorrectorParameters::Record record; -std::vector corrv; -std::vector recordv; -JetCorrectorParametersCollection coll; -JetCorrectorParametersCollection::pair_type pair_type; -JetCorrectorParametersCollection::collection_type colltype; -std::vector collv; -FFTJetCorrectorParameters fftcorr; + +namespace CondFormats_JetMETObjects { + struct dictionary { + JetCorrectorParameters corr; + JetCorrectorParameters::Definitions def; + JetCorrectorParameters::Record record; + std::vector corrv; + std::vector recordv; + JetCorrectorParametersCollection coll; + JetCorrectorParametersCollection::pair_type pair_type; + JetCorrectorParametersCollection::collection_type colltype; + std::vector collv; + FFTJetCorrectorParameters fftcorr; + }; +} diff --git a/CondFormats/L1TObjects/src/classes.h b/CondFormats/L1TObjects/src/classes.h index 9956a1969d877..0dad1cd993e44 100644 --- 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 dummy3 ; std::vector dummy4 ; diff --git a/CondFormats/Luminosity/src/classes.h b/CondFormats/Luminosity/src/classes.h index a471a06a7453a..83a56e8dfa9dd 100644 --- 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::iterator tmp1; std::vector::iterator tmp2; std::vector::iterator tmp3; + }; } diff --git a/CondFormats/OptAlignObjects/src/classes.h b/CondFormats/OptAlignObjects/src/classes.h index 68c6c390489a2..32602096f83cd 100644 --- 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; -namespace{ +namespace CondFormats_OptAlignObjects { struct dictionary { std::vector optaligninfovec; std::vector mbacalvec; diff --git a/CondFormats/PhysicsToolsObjects/src/classes.h b/CondFormats/PhysicsToolsObjects/src/classes.h index baad8fdd43a10..e6730d35844e0 100644 --- 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 index 75e37b8a765d5..04077ff0e9ec6 100644 --- 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 theStrips; diff --git a/CondFormats/RecoMuonObjects/src/classes.h b/CondFormats/RecoMuonObjects/src/classes.h index b8cc3a1db0fd5..2edd17c8de444 100644 --- 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 a; MuScleFitDBobject e; diff --git a/CondFormats/RunInfo/src/classes.h b/CondFormats/RunInfo/src/classes.h index 56434fbafb616..ead1511b0f5dd 100644 --- 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::iterator tmp0; std::vector::iterator tmp1; diff --git a/CondFormats/SiPixelObjects/src/classes.h b/CondFormats/SiPixelObjects/src/classes.h index d12237f8ec516..d721700a00745 100644 --- a/CondFormats/SiPixelObjects/src/classes.h +++ b/CondFormats/SiPixelObjects/src/classes.h @@ -16,7 +16,7 @@ template class PixelDCSObject; template class PixelDCSObject; template class PixelDCSObject; -namespace { +namespace CondFormats_SiPixelObjects { struct dictionary { std::map theMap; std::pair theMapValueT; diff --git a/CondFormats/SiStripObjects/src/classes.h b/CondFormats/SiStripObjects/src/classes.h index a68e3a0d0f45c..76796aeddd52a 100644 --- 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 > tmp1; diff --git a/CondTools/Utilities/test/classes.h b/CondTools/Utilities/test/classes.h index 0cbb8f76149fa..3c5f3700bb677 100644 --- a/CondTools/Utilities/test/classes.h +++ b/CondTools/Utilities/test/classes.h @@ -14,7 +14,7 @@ #include -namespace { +namespace CondTools_Utilities { struct dictionary { CondCachedIter dummy0; diff --git a/DPGAnalysis/SiStripTools/src/classes.h b/DPGAnalysis/SiStripTools/src/classes.h index 18b5d3c39a7de..d7dc2bdca757f 100755 --- 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 index fe8bda88063a2..5767ca164f66c 100644 --- 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 index a1aaa420b948d..ca20fde645464 100644 --- 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; diff --git a/DQMServices/Diagnostic/interface/classes.h b/DQMServices/Diagnostic/interface/classes.h index 3d19d3b1727db..6ce8743f1c3f5 100644 --- a/DQMServices/Diagnostic/interface/classes.h +++ b/DQMServices/Diagnostic/interface/classes.h @@ -9,7 +9,7 @@ // #include "DQMServices/Diagnostic/test/HDQMGraphAnalysis.h" -namespace { +namespace DQMServices_Diagnostic { struct dictionary { CondCachedIter dummy13; diff --git a/DataFormats/Alignment/src/classes.h b/DataFormats/Alignment/src/classes.h index 179a222a4f93b..c87808d08a43b 100644 --- a/DataFormats/Alignment/src/classes.h +++ b/DataFormats/Alignment/src/classes.h @@ -8,7 +8,7 @@ #include "DataFormats/Alignment/interface/TkFittedLasBeam.h" -namespace { +namespace DataFormats_Alignment { struct dictionary { ////////////////////////////////////////////// // for LAS interface to track-based alignment diff --git a/DataFormats/BTauReco/src/classes.h b/DataFormats/BTauReco/src/classes.h index 351984fbcbc00..9feea2667eda5 100755 --- a/DataFormats/BTauReco/src/classes.h +++ b/DataFormats/BTauReco/src/classes.h @@ -46,7 +46,7 @@ namespace reco { typedef TauMassTagInfo::ClusterTrackAssociationCollection::ref_type TauMassTagInfo_ClusterTrackAssociationRefType; } -namespace { +namespace DataFormats_BTauReco { struct dictionary { reco::SecondaryVertexTagInfo::TrackData sv_td; diff --git a/DataFormats/BeamSpot/src/classes.h b/DataFormats/BeamSpot/src/classes.h index aa41840b59645..0c318f8a24867 100644 --- a/DataFormats/BeamSpot/src/classes.h +++ b/DataFormats/BeamSpot/src/classes.h @@ -7,7 +7,7 @@ #include "Math/CylindricalEta3D.h" #include "DataFormats/Math/interface/Vector.h" -namespace { +namespace DataFormats_BeamSpot { struct dictionary { reco::BeamSpot b; edm::Wrapper b_w; diff --git a/DataFormats/CLHEP/src/classes.h b/DataFormats/CLHEP/src/classes.h index 4d06042f0bd43..c2515159f7028 100644 --- a/DataFormats/CLHEP/src/classes.h +++ b/DataFormats/CLHEP/src/classes.h @@ -5,7 +5,7 @@ #include "CLHEP/Vector/LorentzVector.h" #include "CLHEP/Vector/ThreeVector.h" -namespace { +namespace DataFormats_CLHEP { struct dictionary { std::vector dummy0; }; diff --git a/DataFormats/CSCDigi/src/classes.h b/DataFormats/CSCDigi/src/classes.h index d43ba621d5692..c5861cde21f04 100644 --- a/DataFormats/CSCDigi/src/classes.h +++ b/DataFormats/CSCDigi/src/classes.h @@ -34,7 +34,7 @@ #include #include -namespace{ +namespace DataFormats_CSCDigi { struct dictionary { CSCWireDigi cWD_; diff --git a/DataFormats/CSCRecHit/src/classes.h b/DataFormats/CSCRecHit/src/classes.h index c6ea2073a486f..20bea3d222ba7 100644 --- a/DataFormats/CSCRecHit/src/classes.h +++ b/DataFormats/CSCRecHit/src/classes.h @@ -7,7 +7,7 @@ #include #include -namespace{ +namespace DataFormats_CSCRecHit { struct dictionary { std::map > dummycscdetid1; std::map > dummycscdetid2; diff --git a/DataFormats/CaloRecHit/src/classes.h b/DataFormats/CaloRecHit/src/classes.h index c099055e223f1..dc8d872311bcd 100644 --- a/DataFormats/CaloRecHit/src/classes.h +++ b/DataFormats/CaloRecHit/src/classes.h @@ -6,7 +6,7 @@ #include "DataFormats/CaloRecHit/interface/CaloCluster.h" #include "DataFormats/CaloRecHit/interface/CaloClusterFwd.h" -namespace { +namespace DataFormats_CaloRecHit { struct dictionary { // FIXME: The following 2 entries are found already in DataFormats/EgammaReco with the typedef 'reco::BasicCluster' // std::vector v11; diff --git a/DataFormats/CaloTowers/src/classes.h b/DataFormats/CaloTowers/src/classes.h index 1807fd72150de..0106265dfb7cb 100644 --- a/DataFormats/CaloTowers/src/classes.h +++ b/DataFormats/CaloTowers/src/classes.h @@ -13,7 +13,7 @@ #include "DataFormats/Common/interface/FwdPtr.h" -namespace { +namespace DataFormats_CaloTowers { struct dictionary { std::vector v1; CaloTowerCollection c1; diff --git a/DataFormats/Candidate/src/classes.h b/DataFormats/Candidate/src/classes.h index 458dcc425abd4..a67e68c8c55c5 100755 --- a/DataFormats/Candidate/src/classes.h +++ b/DataFormats/Candidate/src/classes.h @@ -39,7 +39,7 @@ namespace reco { typedef edm::AssociationMap > CandViewCandViewAssociation; } -namespace { +namespace DataFormats_Candidate { struct dictionary { std::vector v1; reco::CandidateCollection o1; diff --git a/DataFormats/CastorReco/src/classes.h b/DataFormats/CastorReco/src/classes.h index 2e166fe1e3940..59886bfca0962 100644 --- a/DataFormats/CastorReco/src/classes.h +++ b/DataFormats/CastorReco/src/classes.h @@ -5,7 +5,7 @@ #include "DataFormats/CastorReco/interface/CastorEgamma.h" #include "DataFormats/CastorReco/interface/CastorJet.h" -namespace { +namespace DataFormats_CastorReco { struct dictionary { std::vector v11; reco::CastorTowerCollection v1; diff --git a/DataFormats/Common/src/classes.h b/DataFormats/Common/src/classes.h index 594c19f0b3155..2b5e5efbf2ed5 100644 --- a/DataFormats/Common/src/classes.h +++ b/DataFormats/Common/src/classes.h @@ -29,7 +29,7 @@ #include -namespace { +namespace DataFormats_Common { struct dictionary { edm::Wrapper dummywdfc; edm::Wrapper dummyx16; diff --git a/DataFormats/DTDigi/src/classes.h b/DataFormats/DTDigi/src/classes.h index 0cc9908f6e271..6909481520678 100644 --- a/DataFormats/DTDigi/src/classes.h +++ b/DataFormats/DTDigi/src/classes.h @@ -6,7 +6,7 @@ #include #include -namespace{ +namespace DataFormats_DTDigi { struct dictionary { DTDigi d; diff --git a/DataFormats/DTRecHit/src/classes.h b/DataFormats/DTRecHit/src/classes.h index 75d3ab14425ff..57c336d93ca21 100644 --- a/DataFormats/DTRecHit/src/classes.h +++ b/DataFormats/DTRecHit/src/classes.h @@ -13,7 +13,7 @@ #include #include -namespace{ +namespace DataFormats_DTRecHit { struct dictionary { std::map > dummydtlayerid1; std::map > dummydtlayerid2; diff --git a/DataFormats/DetId/src/classes.h b/DataFormats/DetId/src/classes.h index b2b6df944970d..32bd6574024d5 100644 --- a/DataFormats/DetId/src/classes.h +++ b/DataFormats/DetId/src/classes.h @@ -6,7 +6,7 @@ #include "DataFormats/DetId/interface/DetIdCollection.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace DataFormats_DetId { struct dictionary { std::vector dummy; edm::EDCollection vDI_; diff --git a/DataFormats/EcalDetId/src/classes.h b/DataFormats/EcalDetId/src/classes.h index ea42ff4b2d84f..c1f62c362cf5b 100644 --- a/DataFormats/EcalDetId/src/classes.h +++ b/DataFormats/EcalDetId/src/classes.h @@ -10,7 +10,7 @@ #include "DataFormats/EcalDetId/interface/EcalDetIdCollections.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace DataFormats_EcalDetId { struct dictionary { edm::EDCollection vEBDI_; edm::EDCollection vEEDI_; diff --git a/DataFormats/EcalDigi/src/classes.h b/DataFormats/EcalDigi/src/classes.h index b886d9652671a..907731a3ed953 100644 --- a/DataFormats/EcalDigi/src/classes.h +++ b/DataFormats/EcalDigi/src/classes.h @@ -1,7 +1,7 @@ #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace DataFormats_EcalDigi { struct dictionary { std::vector vMGPA_; std::vector vFEM_; diff --git a/DataFormats/EcalRawData/src/classes.h b/DataFormats/EcalRawData/src/classes.h index f6bc9747d2083..69026bd472b93 100644 --- a/DataFormats/EcalRawData/src/classes.h +++ b/DataFormats/EcalRawData/src/classes.h @@ -10,7 +10,7 @@ #include -namespace { +namespace DataFormats_EcalRawData { struct dictionary { EcalDCCHeaderBlock ERDC_; EcalDCCHeaderBlock::EcalDCCEventSettings ERDCSet_; diff --git a/DataFormats/EcalRecHit/src/classes.h b/DataFormats/EcalRecHit/src/classes.h index e874ae529da8d..e5192ff06e7f7 100644 --- a/DataFormats/EcalRecHit/src/classes.h +++ b/DataFormats/EcalRecHit/src/classes.h @@ -8,7 +8,7 @@ #include "DataFormats/Common/interface/Holder.h" #include -namespace { +namespace DataFormats_EcalRecHit { struct dictionary { EcalUncalibratedRecHit _ahit; std::vector _hitVect; @@ -50,7 +50,7 @@ namespace { #include "DataFormats/EcalRecHit/interface/EcalRecHitComparison.h" #include "boost/cstdint.hpp" -namespace { +namespace DataFormats_EcalRecHit { struct dictionary2 { edm::Wrapper< EcalRecHit > dummy01; edm::Wrapper< std::vector > dummy11; diff --git a/DataFormats/EgammaCandidates/src/classes.h b/DataFormats/EgammaCandidates/src/classes.h index 192e24ab5ef62..dc8f1b812248c 100644 --- a/DataFormats/EgammaCandidates/src/classes.h +++ b/DataFormats/EgammaCandidates/src/classes.h @@ -44,7 +44,7 @@ #include -namespace { +namespace DataFormats_EgammaCandidates { struct dictionary { diff --git a/DataFormats/EgammaReco/src/classes.h b/DataFormats/EgammaReco/src/classes.h index e2377b3b08f90..e52a650d1f337 100644 --- a/DataFormats/EgammaReco/src/classes.h +++ b/DataFormats/EgammaReco/src/classes.h @@ -19,7 +19,7 @@ #include "DataFormats/EgammaReco/interface/BasicClusterShapeAssociation.h" #include "DataFormats/EgammaReco/interface/HFEMClusterShapeAssociation.h" -namespace { +namespace DataFormats_EgammaReco { struct dictionary { edm::RefToBase refToBaseCaloCluster ; diff --git a/DataFormats/EgammaTrackReco/src/classes.h b/DataFormats/EgammaTrackReco/src/classes.h index 3a42dbbe66955..373fe28e3bcac 100644 --- a/DataFormats/EgammaTrackReco/src/classes.h +++ b/DataFormats/EgammaTrackReco/src/classes.h @@ -25,7 +25,7 @@ #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace DataFormats_EgammaTrackReco { struct dictionary { reco::TrackCandidateSuperClusterAssociationCollection v5; diff --git a/DataFormats/FEDRawData/src/classes.h b/DataFormats/FEDRawData/src/classes.h index 7d0ff547a9545..09b8709fe12e6 100644 --- a/DataFormats/FEDRawData/src/classes.h +++ b/DataFormats/FEDRawData/src/classes.h @@ -4,7 +4,7 @@ #include #include - namespace{ +namespace DataFormats_FEDRawData { struct dictionary { FEDRawData a1; std::vector a2; diff --git a/DataFormats/FP420Cluster/src/classes.h b/DataFormats/FP420Cluster/src/classes.h index a31d01a067e70..e2962070b00bb 100755 --- a/DataFormats/FP420Cluster/src/classes.h +++ b/DataFormats/FP420Cluster/src/classes.h @@ -12,7 +12,7 @@ #include "DataFormats/FP420Cluster/interface/ClusterFP420.h" #include "DataFormats/FP420Cluster/interface/ClusterCollectionFP420.h" -namespace { +namespace DataFormats_FP420Cluster { struct dictionary { edm::Wrapper zc0; edm::Wrapper > zc1; @@ -28,7 +28,7 @@ namespace { #include "DataFormats/FP420Cluster/interface/TrackFP420.h" #include "DataFormats/FP420Cluster/interface/TrackCollectionFP420.h" -namespace { +namespace DataFormats_FP420Cluster { struct dictionary2 { edm::Wrapper zt0; edm::Wrapper > zt1; @@ -44,7 +44,7 @@ namespace { #include "DataFormats/FP420Cluster/interface/RecoFP420.h" #include "DataFormats/FP420Cluster/interface/RecoCollectionFP420.h" -namespace { +namespace DataFormats_FP420Cluster { struct dictionary3 { edm::Wrapper zr0; edm::Wrapper > zr1; diff --git a/DataFormats/FP420Digi/src/classes.h b/DataFormats/FP420Digi/src/classes.h index 7004d9e77c939..587ef62390330 100755 --- a/DataFormats/FP420Digi/src/classes.h +++ b/DataFormats/FP420Digi/src/classes.h @@ -10,7 +10,7 @@ #include #include -namespace { +namespace DataFormats_FP420Digi { struct dictionary { edm::Wrapper zs0; edm::Wrapper > zs1; diff --git a/DataFormats/GEMDigi/src/classes.h b/DataFormats/GEMDigi/src/classes.h index 246aa749e7d31..79015d8c3aa46 100644 --- a/DataFormats/GEMDigi/src/classes.h +++ b/DataFormats/GEMDigi/src/classes.h @@ -7,7 +7,7 @@ #include #include -namespace{ +namespace DataFormats_GEMDigi { struct dictionary { GEMDigi g; diff --git a/DataFormats/GEMRecHit/src/classes.h b/DataFormats/GEMRecHit/src/classes.h index fa2daf883fe06..906f536c1b2b9 100644 --- a/DataFormats/GEMRecHit/src/classes.h +++ b/DataFormats/GEMRecHit/src/classes.h @@ -2,7 +2,7 @@ #include "DataFormats/GEMRecHit/interface/GEMRecHitCollection.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace DataFormats_GEMRecHit { struct dictionary { std::pair dummyrpc1; std::pair dummyrpc2; diff --git a/DataFormats/GeometryCommonDetAlgo/src/classes.h b/DataFormats/GeometryCommonDetAlgo/src/classes.h index 64b1e893cdcd2..ffa906f8b62e9 100644 --- a/DataFormats/GeometryCommonDetAlgo/src/classes.h +++ b/DataFormats/GeometryCommonDetAlgo/src/classes.h @@ -3,7 +3,7 @@ #include "DataFormats/Common/interface/ValueMap.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace DataFormats_GeometryCommonDetAlgo { struct dictionary { Measurement1D m; Measurement1DFloat f; diff --git a/DataFormats/GeometryVector/src/classes.h b/DataFormats/GeometryVector/src/classes.h index a59fc78824ad8..5a1ce3b8f8175 100644 --- a/DataFormats/GeometryVector/src/classes.h +++ b/DataFormats/GeometryVector/src/classes.h @@ -15,7 +15,7 @@ #include "DataFormats/GeometryVector/interface/Vector2DBase.h" #include "DataFormats/GeometryVector/interface/Vector3DBase.h" -namespace { +namespace DataFormats_GeometryVector { struct dictionary { Vector2DBase dummy7; Vector3DBase dummy6; diff --git a/DataFormats/GsfTrackReco/src/classes.h b/DataFormats/GsfTrackReco/src/classes.h index 6e43de37162cb..9aa1498dcfdfd 100644 --- a/DataFormats/GsfTrackReco/src/classes.h +++ b/DataFormats/GsfTrackReco/src/classes.h @@ -14,7 +14,7 @@ #include "DataFormats/Common/interface/Holder.h" #include -namespace { +namespace DataFormats_GsfTrackReco { struct dictionary { reco::GsfTrackExtraCollection v4; edm::Wrapper c4; diff --git a/DataFormats/HLTReco/src/classes.h b/DataFormats/HLTReco/src/classes.h index 55b2dcc8080d6..b546a1186f86f 100755 --- a/DataFormats/HLTReco/src/classes.h +++ b/DataFormats/HLTReco/src/classes.h @@ -13,7 +13,7 @@ #include "DataFormats/Common/interface/Ref.h" -namespace { +namespace DataFormats_HLTReco { struct dictionary { edm::EventTime et0; diff --git a/DataFormats/HcalCalibObjects/src/classes.h b/DataFormats/HcalCalibObjects/src/classes.h index 115746730f4c9..66a192790677e 100755 --- a/DataFormats/HcalCalibObjects/src/classes.h +++ b/DataFormats/HcalCalibObjects/src/classes.h @@ -4,7 +4,7 @@ // #include "DataFormats/HOCalibHit/interface/HOCalibVariableCollection.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace DataFormats_HcalCalibObjects { struct dictionary { HEDarkening hed; HFRecalibration hfr; diff --git a/DataFormats/HcalDetId/src/classes.h b/DataFormats/HcalDetId/src/classes.h index 8fc036cc9da64..7a259ad7501d3 100644 --- a/DataFormats/HcalDetId/src/classes.h +++ b/DataFormats/HcalDetId/src/classes.h @@ -12,7 +12,7 @@ #include "DataFormats/HcalDetId/interface/CastorElectronicsId.h" #include -namespace { +namespace DataFormats_HcalDetId { struct dictionary { std::vector eids; std::vector feids; diff --git a/DataFormats/HcalDigi/src/classes.h b/DataFormats/HcalDigi/src/classes.h index 94443e3fdf339..e4f6144ad0270 100644 --- a/DataFormats/HcalDigi/src/classes.h +++ b/DataFormats/HcalDigi/src/classes.h @@ -12,7 +12,7 @@ #include "DataFormats/HcalDigi/interface/HcalTTPDigi.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace DataFormats_HcalDigi { struct dictionary { std::vector vQIE_; std::vector vUQIE_; diff --git a/DataFormats/HcalIsolatedTrack/src/classes.h b/DataFormats/HcalIsolatedTrack/src/classes.h index c5b9dd884f668..0d4832ee6bf76 100644 --- a/DataFormats/HcalIsolatedTrack/src/classes.h +++ b/DataFormats/HcalIsolatedTrack/src/classes.h @@ -1,7 +1,7 @@ #include "DataFormats/Common/interface/Wrapper.h" #include "DataFormats/HcalIsolatedTrack/interface/IsolatedPixelTrackCandidate.h" #include "DataFormats/HcalIsolatedTrack/interface/EcalIsolatedParticleCandidate.h" -namespace { +namespace DataFormats_HcalIsolatedTrack { struct dictionary { edm::Wrapper > > w2; diff --git a/DataFormats/HcalRecHit/src/classes.h b/DataFormats/HcalRecHit/src/classes.h index 0ee3b04c53dc2..fcec3116f33a5 100644 --- a/DataFormats/HcalRecHit/src/classes.h +++ b/DataFormats/HcalRecHit/src/classes.h @@ -17,7 +17,7 @@ #include "DataFormats/Common/interface/Holder.h" #include "DataFormats/Common/interface/RefToBase.h" -namespace { +namespace DataFormats_HcalRecHit { struct dictionary { std::vector vHBHE_; std::vector vHO_; diff --git a/DataFormats/HeavyIonEvent/src/classes.h b/DataFormats/HeavyIonEvent/src/classes.h index a677f82a90028..8b7e19d0b7ae2 100644 --- a/DataFormats/HeavyIonEvent/src/classes.h +++ b/DataFormats/HeavyIonEvent/src/classes.h @@ -3,7 +3,7 @@ #include "DataFormats/HeavyIonEvent/interface/HeavyIon.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace DataFormats_HeavyIonEvent { struct dictionary { reco::EvtPlane dummy1; diff --git a/DataFormats/HepMCCandidate/src/classes.h b/DataFormats/HepMCCandidate/src/classes.h index 55cb944ec0d0e..fc11bf22bb1c4 100755 --- a/DataFormats/HepMCCandidate/src/classes.h +++ b/DataFormats/HepMCCandidate/src/classes.h @@ -10,7 +10,7 @@ #include "DataFormats/HepMCCandidate/interface/FlavorHistoryEvent.h" #include -namespace { +namespace DataFormats_HepMCCandidate { struct dictionary { reco::CompositeRefCandidateT v1; edm::Wrapper w2; diff --git a/DataFormats/Histograms/src/classes.h b/DataFormats/Histograms/src/classes.h index ac23e9f9d6f8a..0b7eb5f15f5a9 100644 --- a/DataFormats/Histograms/src/classes.h +++ b/DataFormats/Histograms/src/classes.h @@ -21,7 +21,7 @@ #include "TString.h" #include -namespace { +namespace DataFormats_Histograms { struct dictionary { edm::Wrapper dummy1C; edm::Wrapper dummy1D; diff --git a/DataFormats/JetReco/src/classes_1.h b/DataFormats/JetReco/src/classes_1.h index 7450e4f16e940..8200911c17b43 100755 --- a/DataFormats/JetReco/src/classes_1.h +++ b/DataFormats/JetReco/src/classes_1.h @@ -23,7 +23,7 @@ #include "DataFormats/Common/interface/PtrVector.h" #include "DataFormats/Common/interface/Ptr.h" -namespace { +namespace DataFormats_JetReco { struct dictionary1 { reco::CaloJetCollection o1; reco::CaloJetRef r1; diff --git a/DataFormats/JetReco/src/classes_2.h b/DataFormats/JetReco/src/classes_2.h index de99bf99892e9..aadc4db531f04 100755 --- a/DataFormats/JetReco/src/classes_2.h +++ b/DataFormats/JetReco/src/classes_2.h @@ -52,7 +52,7 @@ #include "DataFormats/Common/interface/PtrVector.h" #include "DataFormats/Common/interface/Ptr.h" -namespace { +namespace DataFormats_JetReco { struct dictionary2 { reco::FFTBasicJet jet_fft_3; reco::FFTBasicJetCollection o2_fft_3; diff --git a/DataFormats/JetReco/src/classes_3.h b/DataFormats/JetReco/src/classes_3.h index fa664527bb111..633f49602ea9e 100644 --- a/DataFormats/JetReco/src/classes_3.h +++ b/DataFormats/JetReco/src/classes_3.h @@ -38,7 +38,7 @@ #include "DataFormats/Common/interface/PtrVector.h" #include "DataFormats/Common/interface/Ptr.h" -namespace { +namespace DataFormats_JetReco { struct dictionary3 { reco::TrackJetCollection o6; reco::TrackJetRef r6; diff --git a/DataFormats/JetReco/src/classes_4.h b/DataFormats/JetReco/src/classes_4.h index 0575dd9e7ac8a..1de6d0226bba7 100644 --- a/DataFormats/JetReco/src/classes_4.h +++ b/DataFormats/JetReco/src/classes_4.h @@ -38,7 +38,7 @@ #include "DataFormats/JetReco/interface/CATopJetTagInfo.h" -namespace { +namespace DataFormats_JetReco { struct dictionary4 { // jet id stuff reco::JetID jid; diff --git a/DataFormats/L1CSCTrackFinder/src/classes.h b/DataFormats/L1CSCTrackFinder/src/classes.h index f7e8df65a7a8e..e44688ce9c98c 100644 --- a/DataFormats/L1CSCTrackFinder/src/classes.h +++ b/DataFormats/L1CSCTrackFinder/src/classes.h @@ -6,7 +6,7 @@ #include #include -namespace { +namespace DataFormats_L1CSCTrackFinder { struct dictionary { csc::L1Track cL1TRK; csc::L1TrackId cL1TRKID; diff --git a/DataFormats/L1CaloTrigger/src/classes.h b/DataFormats/L1CaloTrigger/src/classes.h index 3eb4a11e363f1..f366121032f9b 100644 --- a/DataFormats/L1CaloTrigger/src/classes.h +++ b/DataFormats/L1CaloTrigger/src/classes.h @@ -3,7 +3,7 @@ #include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace DataFormats_L1CaloTrigger { struct dictionary { L1CaloEmCollection em; L1CaloRegionCollection rgn; diff --git a/DataFormats/L1DTTrackFinder/src/classes.h b/DataFormats/L1DTTrackFinder/src/classes.h index 610a6224adf2f..17db0da2d717b 100644 --- a/DataFormats/L1DTTrackFinder/src/classes.h +++ b/DataFormats/L1DTTrackFinder/src/classes.h @@ -6,7 +6,7 @@ #include #include -namespace{ +namespace DataFormats_L1DTTrackFinder { struct dictionary { L1MuDTChambPhDigi ph_S; L1MuDTChambThDigi th_S; diff --git a/DataFormats/L1GlobalCaloTrigger/src/classes.h b/DataFormats/L1GlobalCaloTrigger/src/classes.h index 29a5cb6c0ed32..daa3c40e54ed4 100644 --- a/DataFormats/L1GlobalCaloTrigger/src/classes.h +++ b/DataFormats/L1GlobalCaloTrigger/src/classes.h @@ -6,7 +6,7 @@ #include "DataFormats/Common/interface/Ref.h" #include "DataFormats/Common/interface/RefProd.h" -namespace { +namespace DataFormats_L1GlobalCaloTrigger { struct dictionary { // internal collections L1GctInternEmCandCollection internEmColl; diff --git a/DataFormats/L1GlobalMuonTrigger/src/classes.h b/DataFormats/L1GlobalMuonTrigger/src/classes.h index 86af17ec32a74..3556e6a5b7839 100644 --- a/DataFormats/L1GlobalMuonTrigger/src/classes.h +++ b/DataFormats/L1GlobalMuonTrigger/src/classes.h @@ -5,7 +5,7 @@ #include "DataFormats/Common/interface/Ref.h" #include "DataFormats/Common/interface/RefProd.h" -namespace { +namespace DataFormats_L1GlobalMuonTrigger { struct dictionary { // L1MuRegionalTriggers -> GMT std::vector dummy0; diff --git a/DataFormats/L1GlobalTrigger/src/classes.h b/DataFormats/L1GlobalTrigger/src/classes.h index 69f61100f0a73..8e4fef29f5543 100644 --- a/DataFormats/L1GlobalTrigger/src/classes.h +++ b/DataFormats/L1GlobalTrigger/src/classes.h @@ -22,7 +22,7 @@ #include #include -namespace { struct dictionary { +namespace DataFormats_L1GlobalTrigger { struct dictionary { // dictionary for L1GtfeWord L1GtfeWord dummy20; edm::Wrapper dummy21; diff --git a/DataFormats/L1Trigger/src/classes.h b/DataFormats/L1Trigger/src/classes.h index fac481f156227..dc8a0833e5626 100644 --- a/DataFormats/L1Trigger/src/classes.h +++ b/DataFormats/L1Trigger/src/classes.h @@ -23,7 +23,7 @@ #include "DataFormats/Common/interface/RefVector.h" #include "DataFormats/Common/interface/RefProd.h" -namespace { +namespace DataFormats_L1Trigger { struct dictionary { l1extra::L1EmParticleCollection emColl ; diff --git a/DataFormats/LTCDigi/src/classes.h b/DataFormats/LTCDigi/src/classes.h index 20f569c33e44e..e071326072539 100644 --- a/DataFormats/LTCDigi/src/classes.h +++ b/DataFormats/LTCDigi/src/classes.h @@ -1,7 +1,7 @@ #include "DataFormats/LTCDigi/interface/LTCDigi.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace DataFormats_LTCDigi { struct dictionary { LTCDigiCollection dummy0; edm::Wrapper dummy1; diff --git a/DataFormats/Luminosity/src/classes.h b/DataFormats/Luminosity/src/classes.h index 05da883c4e91f..204f3323005f5 100644 --- a/DataFormats/Luminosity/src/classes.h +++ b/DataFormats/Luminosity/src/classes.h @@ -4,7 +4,7 @@ #include "DataFormats/Luminosity/interface/LumiSummary.h" #include "DataFormats/Luminosity/interface/LumiDetails.h" -namespace { +namespace DataFormats_Luminosity { struct dictionary { edm::Wrapper lumisummaryrunheaderobj; edm::Wrapper lumisummaryobj; diff --git a/DataFormats/METObjects/src/classes.h b/DataFormats/METObjects/src/classes.h index 59ce97591118c..1f2b173b1d089 100755 --- a/DataFormats/METObjects/src/classes.h +++ b/DataFormats/METObjects/src/classes.h @@ -7,7 +7,7 @@ #include "DataFormats/METObjects/interface/TowerMETCollection.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace DataFormats_METObjects { struct dictionary { edm::Wrapper dummy1; edm::Wrapper dummy2; diff --git a/DataFormats/METReco/src/classes.h b/DataFormats/METReco/src/classes.h index e029cc95cf655..46b865b03d5da 100755 --- a/DataFormats/METReco/src/classes.h +++ b/DataFormats/METReco/src/classes.h @@ -38,7 +38,7 @@ #include "DataFormats/METReco/interface/BoundaryInformation.h" #include -namespace { +namespace DataFormats_METReco { struct dictionary { edm::Wrapper dummy1; edm::Wrapper dummy2; diff --git a/DataFormats/Math/src/classes.h b/DataFormats/Math/src/classes.h index 13041c14377a0..4347e374615b4 100755 --- a/DataFormats/Math/src/classes.h +++ b/DataFormats/Math/src/classes.h @@ -14,7 +14,7 @@ #include "DataFormats/Common/interface/RefVector.h" #include -namespace { +namespace DataFormats_Math { struct dictionary { math::XYZVector v1; math::XYZVectorD vd1; diff --git a/DataFormats/MuonReco/src/classes.h b/DataFormats/MuonReco/src/classes.h index 7655ac3f0a653..753eb54d7398b 100755 --- a/DataFormats/MuonReco/src/classes.h +++ b/DataFormats/MuonReco/src/classes.h @@ -28,7 +28,7 @@ #include #include -namespace { +namespace DataFormats_MuonReco { struct dictionary { std::vector v1; edm::Wrapper > c1; diff --git a/DataFormats/MuonSeed/src/classes.h b/DataFormats/MuonSeed/src/classes.h index 725ad3781934e..20d649f510e0a 100644 --- a/DataFormats/MuonSeed/src/classes.h +++ b/DataFormats/MuonSeed/src/classes.h @@ -8,7 +8,7 @@ #include "DataFormats/Common/interface/AssociationMap.h" #include "DataFormats/Common/interface/OneToMany.h" -namespace { +namespace DataFormats_MuonSeed { struct dictionary { std::vector v1; L2MuonTrajectorySeedCollection c1; diff --git a/DataFormats/ParticleFlowCandidate/src/classes.h b/DataFormats/ParticleFlowCandidate/src/classes.h index c3da92e20cf3e..99a4a9c965b79 100755 --- a/DataFormats/ParticleFlowCandidate/src/classes.h +++ b/DataFormats/ParticleFlowCandidate/src/classes.h @@ -31,7 +31,7 @@ #include "DataFormats/Candidate/interface/Candidate.h" -namespace { +namespace DataFormats_ParticleFlowCandidate { struct dictionary { reco::PFCandidateRef c_r; diff --git a/DataFormats/ParticleFlowReco/src/classes_1.h b/DataFormats/ParticleFlowReco/src/classes_1.h index eeca25b4420d2..0f6af88c41abb 100644 --- a/DataFormats/ParticleFlowReco/src/classes_1.h +++ b/DataFormats/ParticleFlowReco/src/classes_1.h @@ -63,7 +63,7 @@ #include -namespace { +namespace DataFormats_ParticleFlowReco { struct dictionary1 { /* NuclearInteraction stuffs */ diff --git a/DataFormats/ParticleFlowReco/src/classes_2.h b/DataFormats/ParticleFlowReco/src/classes_2.h index 97dce7492c90f..f06ce8065d911 100644 --- a/DataFormats/ParticleFlowReco/src/classes_2.h +++ b/DataFormats/ParticleFlowReco/src/classes_2.h @@ -63,7 +63,7 @@ #include -namespace { +namespace DataFormats_ParticleFlowReco { struct dictionary2 { std::vector dummy1; diff --git a/DataFormats/PatCandidates/src/classes_objects.h b/DataFormats/PatCandidates/src/classes_objects.h index e1ac0025ff2d6..b152674ec21f0 100644 --- a/DataFormats/PatCandidates/src/classes_objects.h +++ b/DataFormats/PatCandidates/src/classes_objects.h @@ -17,7 +17,7 @@ #include "DataFormats/PatCandidates/interface/Hemisphere.h" #include "DataFormats/PatCandidates/interface/Conversion.h" -namespace { +namespace DataFormats_PatCandidates { struct dictionaryobjects { /* PAT Object Collection Iterators */ diff --git a/DataFormats/PatCandidates/src/classes_other.h b/DataFormats/PatCandidates/src/classes_other.h index a05a59a0605fd..fc556d42ff7bd 100644 --- a/DataFormats/PatCandidates/src/classes_other.h +++ b/DataFormats/PatCandidates/src/classes_other.h @@ -17,7 +17,7 @@ #include "DataFormats/PatCandidates/interface/CandKinResolution.h" -namespace { +namespace DataFormats_PatCandidates { struct dictionaryother { std::pair > jcfcf; diff --git a/DataFormats/PatCandidates/src/classes_trigger.h b/DataFormats/PatCandidates/src/classes_trigger.h index 66939399b3040..ee1142b3f7c81 100644 --- a/DataFormats/PatCandidates/src/classes_trigger.h +++ b/DataFormats/PatCandidates/src/classes_trigger.h @@ -8,7 +8,7 @@ #include #include -namespace { +namespace DataFormats_PatCandidates { struct dictionarytrigger { pat::TriggerObjectCollection v_p_to; diff --git a/DataFormats/PatCandidates/src/classes_user.h b/DataFormats/PatCandidates/src/classes_user.h index 93b489a558b0f..5c286c084f560 100644 --- a/DataFormats/PatCandidates/src/classes_user.h +++ b/DataFormats/PatCandidates/src/classes_user.h @@ -10,7 +10,7 @@ #include "DataFormats/TrackReco/interface/TrackFwd.h" #include "DataFormats/TrackReco/interface/Track.h" -namespace { +namespace DataFormats_PatCandidates { struct dictionaryuser { /* UserData: Core */ diff --git a/DataFormats/Provenance/src/classes.h b/DataFormats/Provenance/src/classes.h index 447c182b948a9..3f9d241900350 100644 --- a/DataFormats/Provenance/src/classes.h +++ b/DataFormats/Provenance/src/classes.h @@ -55,7 +55,7 @@ namespace edm { typedef Hash ModuleDescriptionID; } -namespace { +namespace DataFormats_Provenance { struct dictionary { std::pair dummyPairBranch; std::map dummyMapParam; diff --git a/DataFormats/RPCDigi/src/classes.h b/DataFormats/RPCDigi/src/classes.h index 05abd4e87c50a..d915896103410 100644 --- a/DataFormats/RPCDigi/src/classes.h +++ b/DataFormats/RPCDigi/src/classes.h @@ -8,7 +8,7 @@ #include #include -namespace{ +namespace DataFormats_RPCDigi { struct dictionary { RPCDigi d; diff --git a/DataFormats/RPCRecHit/src/classes.h b/DataFormats/RPCRecHit/src/classes.h index dee5380210534..bfd130929b061 100644 --- a/DataFormats/RPCRecHit/src/classes.h +++ b/DataFormats/RPCRecHit/src/classes.h @@ -2,7 +2,7 @@ #include "DataFormats/RPCRecHit/interface/RPCRecHitCollection.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace DataFormats_RPCRecHit { struct dictionary { std::pair dummyrpc1; std::pair dummyrpc2; diff --git a/DataFormats/RecoCandidate/src/classes.h b/DataFormats/RecoCandidate/src/classes.h index b299a7516541c..ff3fc6324a27b 100755 --- a/DataFormats/RecoCandidate/src/classes.h +++ b/DataFormats/RecoCandidate/src/classes.h @@ -38,7 +38,7 @@ #include "DataFormats/RecoCandidate/interface/IsoDepositFwd.h" -namespace { +namespace DataFormats_RecoCandidate { struct dictionary { reco::RecoChargedCandidateCollection v1; diff --git a/DataFormats/Scalers/src/classes.h b/DataFormats/Scalers/src/classes.h index 2489d01422a9e..67403d31ff5c2 100644 --- a/DataFormats/Scalers/src/classes.h +++ b/DataFormats/Scalers/src/classes.h @@ -14,10 +14,8 @@ #include "DataFormats/Common/interface/Ref.h" #include "DataFormats/Common/interface/RefProd.h" -namespace -{ - struct dictionary - { +namespace DataFormats_Scalers { + struct dictionary { L1AcceptBunchCrossing l1AcceptBunchCrossing; L1TriggerScalers l1TriggerScalers; L1TriggerRates l1TriggerRates; diff --git a/DataFormats/SiPixelCluster/src/classes.h b/DataFormats/SiPixelCluster/src/classes.h index 7ebc1eede2ce4..a7553c6c210ce 100644 --- a/DataFormats/SiPixelCluster/src/classes.h +++ b/DataFormats/SiPixelCluster/src/classes.h @@ -5,7 +5,7 @@ #include "DataFormats/Common/interface/Wrapper.h" #include "DataFormats/Common/interface/ContainerMask.h" -namespace { +namespace DataFormats_SiPixelCluster { struct dictionary { std::vector v1; edm::DetSet ds1; diff --git a/DataFormats/SiPixelDigi/src/classes.h b/DataFormats/SiPixelDigi/src/classes.h index 44a6db802ef7b..f3f2c871c1c52 100755 --- a/DataFormats/SiPixelDigi/src/classes.h +++ b/DataFormats/SiPixelDigi/src/classes.h @@ -11,7 +11,7 @@ #include "boost/cstdint.hpp" #include -namespace { +namespace DataFormats_SiPixelDigi { struct dictionary { SiPixelCalibDigi::datacontainer calibdatacontainer; SiPixelCalibDigi calibdigiitself; diff --git a/DataFormats/SiPixelRawData/src/classes.h b/DataFormats/SiPixelRawData/src/classes.h index 165148a9728d6..3bf36d00ff878 100644 --- a/DataFormats/SiPixelRawData/src/classes.h +++ b/DataFormats/SiPixelRawData/src/classes.h @@ -6,7 +6,7 @@ #include "DataFormats/Common/interface/DetSetVector.h" #include -namespace { +namespace DataFormats_SiPixelRawData { struct dictionary { std::vector err0; std::map > err1; diff --git a/DataFormats/SiStripCluster/src/classes.h b/DataFormats/SiStripCluster/src/classes.h index 5f2bd677c7ea8..a2310bb9ab122 100755 --- a/DataFormats/SiStripCluster/src/classes.h +++ b/DataFormats/SiStripCluster/src/classes.h @@ -7,7 +7,7 @@ #include #include "DataFormats/Common/interface/LazyGetter.h" -namespace { +namespace DataFormats_SiStripCluster { struct dictionary { edm::Wrapper siStripClusterCollectionWrapper; }; @@ -18,7 +18,7 @@ namespace { #include "DataFormats/Common/interface/Ref.h" #include "DataFormats/SiStripCluster/interface/SiStripCluster.h" #include "DataFormats/Common/interface/ContainerMask.h" -namespace { +namespace DataFormats_SiStripCluster { struct dictionary2 { edm::Wrapper< SiStripCluster > dummy0; edm::Wrapper< std::vector > dummy1; @@ -47,7 +47,7 @@ namespace { #include "boost/cstdint.hpp" #include "DataFormats/Common/interface/RefGetter.h" -namespace { +namespace DataFormats_SiStripCluster { struct dictionary3 { edm::Wrapper< edm::RegionIndex > dummy7; diff --git a/DataFormats/SiStripCommon/src/classes.h b/DataFormats/SiStripCommon/src/classes.h index 277969c3d08b2..9c1f4efa7587b 100644 --- a/DataFormats/SiStripCommon/src/classes.h +++ b/DataFormats/SiStripCommon/src/classes.h @@ -9,7 +9,7 @@ #include "DataFormats/SiStripCommon/interface/SiStripFedKey.h" #include "DataFormats/SiStripCommon/interface/SiStripDetKey.h" #include "DataFormats/SiStripCommon/interface/SiStripNullKey.h" -namespace { +namespace DataFormats_SiStripCommon { struct dictionary1 { // edm::Wrapper< SiStripFecKey > fec; // edm::Wrapper< SiStripFedKey > fed; @@ -19,7 +19,7 @@ namespace { } #include "DataFormats/SiStripCommon/interface/SiStripEventSummary.h" -namespace { +namespace DataFormats_SiStripCommon { struct dictionary2 { edm::Wrapper< sistrip::RunType > run_type; edm::Wrapper< sistrip::ApvReadoutMode > apv_mode; diff --git a/DataFormats/SiStripDigi/src/classes.h b/DataFormats/SiStripDigi/src/classes.h index 5561f99883095..f95bea6501890 100755 --- a/DataFormats/SiStripDigi/src/classes.h +++ b/DataFormats/SiStripDigi/src/classes.h @@ -9,7 +9,7 @@ #include #include "DataFormats/SiStripDigi/interface/SiStripDigi.h" -namespace { +namespace DataFormats_SiStripDigi { struct dictionary1 { edm::Wrapper zs0; edm::Wrapper > zs1; @@ -22,7 +22,7 @@ namespace { #include "DataFormats/SiStripDigi/interface/SiStripRawDigi.h" #include "boost/cstdint.hpp" -namespace { +namespace DataFormats_SiStripDigi { struct dictionary2 { edm::Wrapper raw0; edm::Wrapper > raw1; @@ -34,7 +34,7 @@ namespace { } #include "DataFormats/SiStripDigi/interface/SiStripProcessedRawDigi.h" -namespace { +namespace DataFormats_SiStripDigi { struct dictionary3 { edm::Wrapper praw0; edm::Wrapper > praw1; diff --git a/DataFormats/StdDictionaries/src/classes_map.h b/DataFormats/StdDictionaries/src/classes_map.h index 89f03c3cbfcfb..fd7f4619c420d 100644 --- a/DataFormats/StdDictionaries/src/classes_map.h +++ b/DataFormats/StdDictionaries/src/classes_map.h @@ -6,7 +6,7 @@ #include #include -namespace { +namespace DataFormats_StdDictionaries { struct dictionarymap { std::map dummywm4; std::map > dummymipdd; diff --git a/DataFormats/StdDictionaries/src/classes_others.h b/DataFormats/StdDictionaries/src/classes_others.h index 852bddd6a9650..3192753dd2a2d 100644 --- a/DataFormats/StdDictionaries/src/classes_others.h +++ b/DataFormats/StdDictionaries/src/classes_others.h @@ -7,7 +7,7 @@ #include #include -namespace { +namespace DataFormats_StdDictionaries { struct dictionaryothers { std::allocator achar; std::allocator adouble; diff --git a/DataFormats/StdDictionaries/src/classes_pair.h b/DataFormats/StdDictionaries/src/classes_pair.h index b76f8873c3104..3f8fc9fe6c34a 100644 --- a/DataFormats/StdDictionaries/src/classes_pair.h +++ b/DataFormats/StdDictionaries/src/classes_pair.h @@ -6,7 +6,7 @@ #include #include -namespace { +namespace DataFormats_StdDictionaries { struct dictionarypair { std::pair newDummy00; std::pair > newDummy01; diff --git a/DataFormats/StdDictionaries/src/classes_vector.h b/DataFormats/StdDictionaries/src/classes_vector.h index 4f297ff15b02b..8146e11f1b1da 100644 --- a/DataFormats/StdDictionaries/src/classes_vector.h +++ b/DataFormats/StdDictionaries/src/classes_vector.h @@ -6,7 +6,7 @@ #include #include -namespace { +namespace DataFormats_StdDictionaries { struct dictionaryvector { std::vector dummy13; std::vector dummy6p; diff --git a/DataFormats/Streamer/src/classes.h b/DataFormats/Streamer/src/classes.h index 5e44da40d72fa..a6f4de10f84f6 100644 --- a/DataFormats/Streamer/src/classes.h +++ b/DataFormats/Streamer/src/classes.h @@ -1,7 +1,7 @@ #include "DataFormats/Streamer/interface/StreamedProducts.h" #include -namespace { +namespace DataFormats_Streamer { struct dictionary { }; } diff --git a/DataFormats/TauReco/src/classes_1.h b/DataFormats/TauReco/src/classes_1.h index d6767c591e741..ee489ffaa7010 100644 --- a/DataFormats/TauReco/src/classes_1.h +++ b/DataFormats/TauReco/src/classes_1.h @@ -27,7 +27,7 @@ #include #include -namespace { +namespace DataFormats_TauReco { struct dictionary1 { reco::L2TauIsolationInfo l2iI; reco::L2TauInfoAssociation l2ts; diff --git a/DataFormats/TauReco/src/classes_2.h b/DataFormats/TauReco/src/classes_2.h index 7d8ede39b5d3a..028ef2a6ea0e4 100644 --- a/DataFormats/TauReco/src/classes_2.h +++ b/DataFormats/TauReco/src/classes_2.h @@ -27,7 +27,7 @@ #include #include -namespace { +namespace DataFormats_TauReco { struct dictionary2 { std::vector pft_v; diff --git a/DataFormats/TauReco/src/classes_3.h b/DataFormats/TauReco/src/classes_3.h index ea7fa11eaf7da..a4e83c061106f 100644 --- a/DataFormats/TauReco/src/classes_3.h +++ b/DataFormats/TauReco/src/classes_3.h @@ -27,7 +27,7 @@ #include #include -namespace { +namespace DataFormats_TauReco { struct dictionary4 { reco::CaloTauDiscriminatorAgainstElectronBase calotde_b; diff --git a/DataFormats/TauReco/src/classes_hlt.h b/DataFormats/TauReco/src/classes_hlt.h index 3a380f99f2c81..4a5451ec68f11 100644 --- a/DataFormats/TauReco/src/classes_hlt.h +++ b/DataFormats/TauReco/src/classes_hlt.h @@ -20,7 +20,7 @@ #include #include -namespace { +namespace DataFormats_TauReco { struct dictionaryhlt { //Needed only in HLT-Open std::vector ht_v; diff --git a/DataFormats/TestObjects/src/classes.h b/DataFormats/TestObjects/src/classes.h index 0576f686ee14a..ac4f544c37e70 100644 --- a/DataFormats/TestObjects/src/classes.h +++ b/DataFormats/TestObjects/src/classes.h @@ -19,7 +19,7 @@ #include "DataFormats/Common/interface/Holder.h" #include "DataFormats/Common/interface/RefToBaseProd.h" -namespace { +namespace DataFormats_TestObjects { struct dictionary { edm::Wrapper dummyw12; edm::Wrapper dummyw13; diff --git a/DataFormats/TrackCandidate/src/classes.h b/DataFormats/TrackCandidate/src/classes.h index a49c4c604ef15..fbfdc1a82a3b7 100644 --- a/DataFormats/TrackCandidate/src/classes.h +++ b/DataFormats/TrackCandidate/src/classes.h @@ -6,7 +6,7 @@ #include "DataFormats/TrackCandidate/interface/TrackCandidateSeedAssociation.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace DataFormats_TrackCandidate { struct dictionary { TrackCandidate tc; TrackCandidateCollection coll; diff --git a/DataFormats/TrackReco/src/classes.h b/DataFormats/TrackReco/src/classes.h index d9d26892ff636..7a3fac638ad69 100755 --- a/DataFormats/TrackReco/src/classes.h +++ b/DataFormats/TrackReco/src/classes.h @@ -30,7 +30,7 @@ #include -namespace { +namespace DataFormats_TrackReco { struct dictionary { reco::TrackExtraCollection v3; edm::Wrapper c3; diff --git a/DataFormats/TrackerCommon/src/classes.h b/DataFormats/TrackerCommon/src/classes.h index 14447e4f98268..836e3850cf2c8 100644 --- a/DataFormats/TrackerCommon/src/classes.h +++ b/DataFormats/TrackerCommon/src/classes.h @@ -2,7 +2,7 @@ #include "DataFormats/Common/interface/Wrapper.h" #include -namespace { class dictionary { +namespace DataFormats_TrackerCommon { class dictionary { ClusterSummary dummy0; edm::Wrapper dummy1; };} diff --git a/DataFormats/TrackerRecHit2D/src/classes.h b/DataFormats/TrackerRecHit2D/src/classes.h index 1e42a06795c78..c880ca778c16a 100755 --- a/DataFormats/TrackerRecHit2D/src/classes.h +++ b/DataFormats/TrackerRecHit2D/src/classes.h @@ -29,7 +29,7 @@ #include "DataFormats/TrackerRecHit2D/interface/SiTrackerMultiRecHit.h" #include -namespace { +namespace DataFormats_TrackerRecHit2D { struct dictionary { ProjectedSiStripRecHit2D projHit; SiStripRecHit2D a1; diff --git a/DataFormats/TrackingRecHit/src/classes.h b/DataFormats/TrackingRecHit/src/classes.h index 767b879cdd92b..80fd1d1470d11 100644 --- a/DataFormats/TrackingRecHit/src/classes.h +++ b/DataFormats/TrackingRecHit/src/classes.h @@ -7,7 +7,7 @@ #include "DataFormats/TrackingRecHit/interface/RecSegment.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace DataFormats_TrackingRecHit { struct dictionary { AlgebraicSymMatrix as; diff --git a/DataFormats/TrackingSeed/src/classes.h b/DataFormats/TrackingSeed/src/classes.h index 1e044e4b218f8..39374c110d0e7 100755 --- a/DataFormats/TrackingSeed/src/classes.h +++ b/DataFormats/TrackingSeed/src/classes.h @@ -5,7 +5,7 @@ #include "DataFormats/Common/interface/Wrapper.h" #include -namespace { +namespace DataFormats_TrackingSeed { struct dictionary { edm::Wrapper trackingSeedCollectionWrapper; }; diff --git a/DataFormats/TrajectorySeed/src/classes.h b/DataFormats/TrajectorySeed/src/classes.h index 568957d133aad..e0d206a070176 100644 --- a/DataFormats/TrajectorySeed/src/classes.h +++ b/DataFormats/TrajectorySeed/src/classes.h @@ -7,7 +7,7 @@ #include "DataFormats/Common/interface/Ref.h" #include "DataFormats/Common/interface/RefToBase.h" -namespace { +namespace DataFormats_TrajectorySeed { struct dictionary { std::vector v1; TrajectorySeedCollection c1; diff --git a/DataFormats/TrajectoryState/src/classes.h b/DataFormats/TrajectoryState/src/classes.h index de60ec10a83c9..b1b45d077f354 100644 --- a/DataFormats/TrajectoryState/src/classes.h +++ b/DataFormats/TrajectoryState/src/classes.h @@ -1,6 +1,6 @@ #include "DataFormats/TrajectoryState/interface/PTrajectoryStateOnDet.h" -namespace { +namespace DataFormats_TrajectoryState { struct dictionary { PTrajectoryStateOnDet v1; LocalTrajectoryParameters p1; diff --git a/DataFormats/V0Candidate/src/classes.h b/DataFormats/V0Candidate/src/classes.h index a20f6c5c73b5a..c072e132ad277 100755 --- a/DataFormats/V0Candidate/src/classes.h +++ b/DataFormats/V0Candidate/src/classes.h @@ -1,6 +1,6 @@ #include "DataFormats/V0Candidate/interface/V0Candidate.h" -namespace { +namespace DataFormats_V0Candidate { struct dictionary { std::vector v01; edm::Wrapper > wv01; diff --git a/DataFormats/VZero/src/classes.h b/DataFormats/VZero/src/classes.h index 9ddba4f14ab6c..7461c53ddecc6 100644 --- a/DataFormats/VZero/src/classes.h +++ b/DataFormats/VZero/src/classes.h @@ -2,7 +2,7 @@ #include "DataFormats/VZero/interface/VZero.h" #include -namespace { +namespace DataFormats_VZero { struct dictionary { reco::VZeroCollection v9; edm::Wrapper c9; diff --git a/DataFormats/VertexReco/src/classes.h b/DataFormats/VertexReco/src/classes.h index 04ba48bba2703..3eacae92435eb 100755 --- a/DataFormats/VertexReco/src/classes.h +++ b/DataFormats/VertexReco/src/classes.h @@ -17,7 +17,7 @@ #include #include -namespace { +namespace DataFormats_VertexReco { struct dictionary { reco::Vertex rv1; std::vector v1; diff --git a/DataFormats/WrappedStdDictionaries/src/classes.h b/DataFormats/WrappedStdDictionaries/src/classes.h index 20e3f5ef1eb5e..88b2ac4a011ef 100644 --- a/DataFormats/WrappedStdDictionaries/src/classes.h +++ b/DataFormats/WrappedStdDictionaries/src/classes.h @@ -7,7 +7,7 @@ #include #include -namespace { +namespace DataFormats_WrappedStdDictionaries { struct dictionary { edm::Wrapper > dummy1; edm::Wrapper > dummy2; diff --git a/FWCore/MessageLogger/src/classes.h b/FWCore/MessageLogger/src/classes.h index 5d301b436eab0..6c133fc355446 100644 --- a/FWCore/MessageLogger/src/classes.h +++ b/FWCore/MessageLogger/src/classes.h @@ -1,7 +1,7 @@ #include #include "FWCore/MessageLogger/interface/ErrorSummaryEntry.h" -namespace { +namespace FWCore_MessageLogger { struct dictionary { std::vector w_v_es; }; diff --git a/FWCore/Skeletons/scripts/mkTemplates/DataPkg/classes.h b/FWCore/Skeletons/scripts/mkTemplates/DataPkg/classes.h index 16652e5e7c701..cbe390f41b926 100644 --- a/FWCore/Skeletons/scripts/mkTemplates/DataPkg/classes.h +++ b/FWCore/Skeletons/scripts/mkTemplates/DataPkg/classes.h @@ -4,7 +4,7 @@ #include "__subsys__/__pkgname__/interface/YOUR_CLASS_GOES_HERE.h" #include -namespace { +namespace FWCore_Skeletons { struct __subsys_____class__ { //add 'dummy' Wrapper variable for each class type you put into the Event edm::Wrapper dummy1; diff --git a/FWCore/Skeletons/scripts/mkTemplates/TSelector/classes.h b/FWCore/Skeletons/scripts/mkTemplates/TSelector/classes.h index 8afcbd7cdf6c5..750ff85d115fc 100644 --- a/FWCore/Skeletons/scripts/mkTemplates/TSelector/classes.h +++ b/FWCore/Skeletons/scripts/mkTemplates/TSelector/classes.h @@ -1,6 +1,6 @@ #include "__subsys__/__class__/src/__class__.h" -namespace { +namespace FWCore_Skeletons { struct dictionary { }; } diff --git a/FastSimDataFormats/External/src/classes.h b/FastSimDataFormats/External/src/classes.h index df9b445615362..ba1e91a0a0873 100644 --- a/FastSimDataFormats/External/src/classes.h +++ b/FastSimDataFormats/External/src/classes.h @@ -2,7 +2,7 @@ #include "FastSimDataFormats/External/interface/FastTrackerClusterCollection.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace FastSimDataFormats_External { struct dictionary { // dummy is a dummy FastL1BitInfoCollection dummy01; diff --git a/FastSimDataFormats/NuclearInteractions/src/classes.h b/FastSimDataFormats/NuclearInteractions/src/classes.h index 7623747f8c123..ff662450b8138 100644 --- a/FastSimDataFormats/NuclearInteractions/src/classes.h +++ b/FastSimDataFormats/NuclearInteractions/src/classes.h @@ -14,7 +14,7 @@ #include -namespace { +namespace FastSimDataFormats_NuclearInteractions { struct dictionary { FSimVertexType dummy0; diff --git a/FastSimDataFormats/PileUpEvents/src/classes.h b/FastSimDataFormats/PileUpEvents/src/classes.h index 90098de1db68c..9ee685e4295e1 100644 --- a/FastSimDataFormats/PileUpEvents/src/classes.h +++ b/FastSimDataFormats/PileUpEvents/src/classes.h @@ -1,6 +1,6 @@ #include "FastSimDataFormats/PileUpEvents/interface/PUEvent.h" -namespace { +namespace FastSimDataFormats_PileUpEvents { struct dictionary { diff --git a/Fireworks/Core/src/classes.h b/Fireworks/Core/src/classes.h index 22df86c6a7bc7..5a2c153c6d15f 100644 --- a/Fireworks/Core/src/classes.h +++ b/Fireworks/Core/src/classes.h @@ -31,7 +31,7 @@ #include "Fireworks/Core/interface/FWTSelectorToEventList.h" #include "Fireworks/Core/src/FWEveDigitSetScalableMarker.h" #include "Fireworks/Core/src/FW3DViewDistanceMeasureTool.h" -namespace { +namespace Fireworks_Core { struct Fireworks_Core { //add 'dummy' Wrapper variable for each class type you put into the Event //FWDisplayEvent de; diff --git a/PhysicsTools/FWLite/src/classes.h b/PhysicsTools/FWLite/src/classes.h index 202307aba5bfb..f5e1bc9e5a8dc 100644 --- a/PhysicsTools/FWLite/src/classes.h +++ b/PhysicsTools/FWLite/src/classes.h @@ -14,7 +14,7 @@ namespace reco { namespace parser { } } -namespace { +namespace PhysicsTools_FWLite { struct dictionary { // all these are templates, so we need to instantiate them reco::parser::ExpressionPtr eptr; diff --git a/PhysicsTools/IsolationUtils/src/classes.h b/PhysicsTools/IsolationUtils/src/classes.h index 7bc9fb48a68ac..703f802812080 100755 --- a/PhysicsTools/IsolationUtils/src/classes.h +++ b/PhysicsTools/IsolationUtils/src/classes.h @@ -3,7 +3,7 @@ typedef PtIsolationAlgo CandPtIsolationAlgo; -namespace { +namespace PhysicsTools_IsolationUtils { struct dictionary { CandPtIsolationAlgo iso1; }; diff --git a/PhysicsTools/MVAComputer/src/classes.h b/PhysicsTools/MVAComputer/src/classes.h index 45cf9d6f2859d..f71cec2eac8da 100644 --- a/PhysicsTools/MVAComputer/src/classes.h +++ b/PhysicsTools/MVAComputer/src/classes.h @@ -6,7 +6,7 @@ #include "PhysicsTools/MVAComputer/interface/TreeReader.h" #ifdef __GCCXML__ -namespace { // anonymous +namespace PhysicsTools_MVAComputer { // anonymous struct dictionary { std::vector vv; diff --git a/PhysicsTools/MVATrainer/src/classes.h b/PhysicsTools/MVATrainer/src/classes.h index 8939236c72286..88af577a4025c 100644 --- a/PhysicsTools/MVATrainer/src/classes.h +++ b/PhysicsTools/MVATrainer/src/classes.h @@ -1,7 +1,7 @@ #include "PhysicsTools/MVATrainer/interface/MVATrainer.h" #include "PhysicsTools/MVATrainer/interface/TreeTrainer.h" -namespace { // anonymous +namespace PhysicsTools_MVATrainer { // anonymous struct dictionary { }; diff --git a/PhysicsTools/ParallelAnalysis/src/classes.h b/PhysicsTools/ParallelAnalysis/src/classes.h index 1c702e5ad2f5a..d5d984048c3c7 100755 --- a/PhysicsTools/ParallelAnalysis/src/classes.h +++ b/PhysicsTools/ParallelAnalysis/src/classes.h @@ -1,6 +1,6 @@ #include "PhysicsTools/ParallelAnalysis/interface/TrackTSelector.h" -namespace { +namespace PhysicsTools_ParallelAnalysis { struct dictionary { }; } diff --git a/PhysicsTools/PatUtils/src/classes.h b/PhysicsTools/PatUtils/src/classes.h index c1161400e1792..11423f5f3bc32 100644 --- a/PhysicsTools/PatUtils/src/classes.h +++ b/PhysicsTools/PatUtils/src/classes.h @@ -1,5 +1,5 @@ #include "PhysicsTools/PatUtils/interface/PATDiObjectProxy.h" -namespace { struct dictionary { // apparenlty better than namespace { namespace { +namespace PhysicsTools_PatUtils { struct dictionary { // apparenlty better than echo namespace PhysicsTools_PatUtils { echo namespace PhysicsTools_PatUtils { pat::DiObjectProxy patDiObjectProxy; }; } diff --git a/PhysicsTools/SelectorUtils/src/classes.h b/PhysicsTools/SelectorUtils/src/classes.h index c156b04a6ad53..d3e51a1a2aec4 100644 --- a/PhysicsTools/SelectorUtils/src/classes.h +++ b/PhysicsTools/SelectorUtils/src/classes.h @@ -12,7 +12,7 @@ #include "PhysicsTools/SelectorUtils/interface/RunLumiSelector.h" -namespace { +namespace PhysicsTools_SelectorUtils { struct dictionary { pat::strbitset strbitset; diff --git a/PhysicsTools/TagAndProbe/src/classes.h b/PhysicsTools/TagAndProbe/src/classes.h deleted file mode 100644 index 5ab30e7ed2cfb..0000000000000 --- a/PhysicsTools/TagAndProbe/src/classes.h +++ /dev/null @@ -1,3 +0,0 @@ -namespace tagandprobe { - struct dummy{}; -} diff --git a/PhysicsTools/TagAndProbe/src/classes_def.xml b/PhysicsTools/TagAndProbe/src/classes_def.xml deleted file mode 100644 index 605df1ca30728..0000000000000 --- a/PhysicsTools/TagAndProbe/src/classes_def.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/PhysicsTools/Utilities/src/classes.h b/PhysicsTools/Utilities/src/classes.h index db15b4b98c004..f197edcf38c4d 100755 --- a/PhysicsTools/Utilities/src/classes.h +++ b/PhysicsTools/Utilities/src/classes.h @@ -6,7 +6,7 @@ #include "PhysicsTools/Utilities/interface/Lumi3DReWeighting.h" -namespace { +namespace PhysicsTools_Utilities { struct dictionary { reweight::PoissonMeanShifter a; diff --git a/RecoParticleFlow/PFRootEvent/src/classes.h b/RecoParticleFlow/PFRootEvent/src/classes.h index f2c2414aaedf8..03a05b80840de 100644 --- a/RecoParticleFlow/PFRootEvent/src/classes.h +++ b/RecoParticleFlow/PFRootEvent/src/classes.h @@ -17,7 +17,7 @@ -namespace { +namespace RecoParticleFlow_PFRootEvent { struct dictionary { /* GPFRecHit dummy1; */ /* std::vector > dummy2; */ diff --git a/RecoParticleFlow/PFRootEvent/template/src/classes.h b/RecoParticleFlow/PFRootEvent/template/src/classes.h index a1731be95a226..2c5b7789ecf8c 100644 --- a/RecoParticleFlow/PFRootEvent/template/src/classes.h +++ b/RecoParticleFlow/PFRootEvent/template/src/classes.h @@ -1,6 +1,6 @@ #include "RecoParticleFlow/MyPFRootEvent/interface/MyPFRootEventManager.h" -namespace { +namespace RecoParticleFlow_PFRootEvent { struct dictionary { }; diff --git a/RecoTracker/MeasurementDet/src/classes.h b/RecoTracker/MeasurementDet/src/classes.h index 018ab13a2136e..73fa3ed6d2316 100644 --- a/RecoTracker/MeasurementDet/src/classes.h +++ b/RecoTracker/MeasurementDet/src/classes.h @@ -1,7 +1,7 @@ #include "DataFormats/Common/interface/Wrapper.h" #include "RecoTracker/MeasurementDet/interface/MeasurementTrackerEvent.h" -namespace { struct dictionary { +namespace RecoTracker_MeasurementDet { struct dictionary { MeasurementTrackerEvent dummy; edm::Wrapper dummy1; };} diff --git a/RecoTracker/TkSeedGenerator/src/classes.h b/RecoTracker/TkSeedGenerator/src/classes.h index eeccba6f84e4b..309994c191d42 100644 --- a/RecoTracker/TkSeedGenerator/src/classes.h +++ b/RecoTracker/TkSeedGenerator/src/classes.h @@ -1,5 +1,5 @@ #include "RecoTracker/TkSeedGenerator/interface/ClusterChecker.h" -namespace { +namespace RecoTracker_TkSeedGenerator { struct dictionary { reco::utils::ClusterTotals totals; }; diff --git a/SimDataFormats/CaloHit/src/classes.h b/SimDataFormats/CaloHit/src/classes.h index dff722fc74cd1..9e56e8a661e1a 100644 --- a/SimDataFormats/CaloHit/src/classes.h +++ b/SimDataFormats/CaloHit/src/classes.h @@ -4,7 +4,7 @@ #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace SimDataFormats_CaloHit { struct dictionary { HFShowerLibraryEventInfo rv1; edm::Wrapper p1; diff --git a/SimDataFormats/CaloTest/src/classes.h b/SimDataFormats/CaloTest/src/classes.h index 8ac58212aff9a..97d2ada98aa50 100644 --- a/SimDataFormats/CaloTest/src/classes.h +++ b/SimDataFormats/CaloTest/src/classes.h @@ -1,7 +1,7 @@ #include "SimDataFormats/CaloTest/interface/HcalTestHistoClass.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace SimDataFormats_CaloTest { struct dictionary { HcalTestHistoClass theHcalTestHistoClass; }; diff --git a/SimDataFormats/CrossingFrame/src/classes.h b/SimDataFormats/CrossingFrame/src/classes.h index bd8be67fc105a..4afc44e3df424 100755 --- a/SimDataFormats/CrossingFrame/src/classes.h +++ b/SimDataFormats/CrossingFrame/src/classes.h @@ -12,7 +12,7 @@ #include #include -namespace { +namespace SimDataFormats_CrossingFrame { struct dictionary { CrossingFrame dummy0; diff --git a/SimDataFormats/DigiSimLinks/src/classes.h b/SimDataFormats/DigiSimLinks/src/classes.h index ec41d1a60af07..2768f92192993 100644 --- a/SimDataFormats/DigiSimLinks/src/classes.h +++ b/SimDataFormats/DigiSimLinks/src/classes.h @@ -4,7 +4,7 @@ #include #include -namespace{ +namespace SimDataFormats_DigiSimLinks { struct dictionary { DTDigiSimLink dummy0; diff --git a/SimDataFormats/EcalTestBeam/src/classes.h b/SimDataFormats/EcalTestBeam/src/classes.h index a53664dfde56b..39d73c5367325 100644 --- a/SimDataFormats/EcalTestBeam/src/classes.h +++ b/SimDataFormats/EcalTestBeam/src/classes.h @@ -4,7 +4,7 @@ #include "DataFormats/Common/interface/Wrapper.h" #include -namespace { +namespace SimDataFormats_EcalTestBeam { struct dictionary { PEcalTBInfo theInfo; edm::Wrapper theEcalTBInfo; diff --git a/SimDataFormats/EncodedEventId/src/classes.h b/SimDataFormats/EncodedEventId/src/classes.h index 0b64fb9cc3e6d..03f95148174f3 100644 --- a/SimDataFormats/EncodedEventId/src/classes.h +++ b/SimDataFormats/EncodedEventId/src/classes.h @@ -2,7 +2,7 @@ #include #include -namespace { +namespace SimDataFormats_EncodedEventId { struct dictionary { std::vector dummy; }; diff --git a/SimDataFormats/Forward/src/classes.h b/SimDataFormats/Forward/src/classes.h index 558de445cbdaf..4eb230bf220dd 100644 --- a/SimDataFormats/Forward/src/classes.h +++ b/SimDataFormats/Forward/src/classes.h @@ -4,7 +4,7 @@ #include "DataFormats/Common/interface/Wrapper.h" #include -namespace { +namespace SimDataFormats_Forward { struct dictionary { TotemTestHistoClass theTotemTestHisto; edm::Wrapper theTotemTestHistoClass; diff --git a/SimDataFormats/GeneratorProducts/src/classes.h b/SimDataFormats/GeneratorProducts/src/classes.h index ed54b68c15852..3faf9bcd17477 100644 --- a/SimDataFormats/GeneratorProducts/src/classes.h +++ b/SimDataFormats/GeneratorProducts/src/classes.h @@ -18,7 +18,7 @@ #include -namespace { +namespace SimDataFormats_GeneratorProducts { struct dictionary { // HepMC externals used in HepMCProduct diff --git a/SimDataFormats/HcalTestBeam/src/classes.h b/SimDataFormats/HcalTestBeam/src/classes.h index d2d6f550383b2..2cac6b6af5334 100644 --- a/SimDataFormats/HcalTestBeam/src/classes.h +++ b/SimDataFormats/HcalTestBeam/src/classes.h @@ -4,7 +4,7 @@ #include "DataFormats/Common/interface/Wrapper.h" #include -namespace { +namespace SimDataFormats_HcalTestBeam { struct dictionary { PHcalTB04Info theInfo4; edm::Wrapper theTB04Info; diff --git a/SimDataFormats/HiGenData/src/classes.h b/SimDataFormats/HiGenData/src/classes.h index 2b89234eceebd..8098155f5abd6 100644 --- a/SimDataFormats/HiGenData/src/classes.h +++ b/SimDataFormats/HiGenData/src/classes.h @@ -1,7 +1,7 @@ #include "SimDataFormats/HiGenData/interface/GenHIEvent.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace SimDataFormats_HiGenData { struct dictionary { edm::GenHIEvent dummy0; edm::Wrapper dummy1; diff --git a/SimDataFormats/JetMatching/src/classes.h b/SimDataFormats/JetMatching/src/classes.h index 5e09254e0b1fb..91ac553335a70 100755 --- a/SimDataFormats/JetMatching/src/classes.h +++ b/SimDataFormats/JetMatching/src/classes.h @@ -7,7 +7,7 @@ #include "SimDataFormats/JetMatching/interface/MatchedPartons.h" #include "SimDataFormats/JetMatching/interface/JetMatchedPartons.h" -namespace { +namespace SimDataFormats_JetMatching { struct dictionary { reco::JetFlavour jf; reco::JetFlavour::Leptons jflep; diff --git a/SimDataFormats/PileupSummaryInfo/src/classes.h b/SimDataFormats/PileupSummaryInfo/src/classes.h index d621f4855fbe8..4b0d6241bbe1f 100644 --- a/SimDataFormats/PileupSummaryInfo/src/classes.h +++ b/SimDataFormats/PileupSummaryInfo/src/classes.h @@ -3,7 +3,7 @@ #include "DataFormats/Common/interface/Wrapper.h" #include -namespace { +namespace SimDataFormats_PileupSummaryInfo { struct dictionary { PileupSummaryInfo dummy0; std::vector dummy1; diff --git a/SimDataFormats/RPCDigiSimLink/src/classes.h b/SimDataFormats/RPCDigiSimLink/src/classes.h index 6703af4ceb998..991e8132ce724 100644 --- a/SimDataFormats/RPCDigiSimLink/src/classes.h +++ b/SimDataFormats/RPCDigiSimLink/src/classes.h @@ -12,7 +12,7 @@ #include "SimDataFormats/RPCDigiSimLink/interface/RPCDigiSimLink.h" -namespace { +namespace SimDataFormats_RPCDigiSimLink { struct dictionary { edm::Wrapper RPCDigiSimLinkWrapper; edm::Wrapper< std::vector > RPCDigiSimLinkVector; diff --git a/SimDataFormats/RandomEngine/src/classes.h b/SimDataFormats/RandomEngine/src/classes.h index 7a47d461cfdc5..c1fcf9c9f36c5 100644 --- a/SimDataFormats/RandomEngine/src/classes.h +++ b/SimDataFormats/RandomEngine/src/classes.h @@ -4,7 +4,7 @@ #include "DataFormats/Common/interface/Wrapper.h" #include -namespace { +namespace SimDataFormats_RandomEngine { struct dictionary { edm::Wrapper > dummy1; edm::Wrapper dummy2; diff --git a/SimDataFormats/Track/src/classes.h b/SimDataFormats/Track/src/classes.h index 24f374e241577..8379797dd94f7 100644 --- a/SimDataFormats/Track/src/classes.h +++ b/SimDataFormats/Track/src/classes.h @@ -5,7 +5,7 @@ #include -namespace { +namespace SimDataFormats_Track { struct dictionary { SimTrack dummy22; edm::SimTrackContainer dummy222; diff --git a/SimDataFormats/TrackerDigiSimLink/src/classes.h b/SimDataFormats/TrackerDigiSimLink/src/classes.h index 9960bd19d995a..e2f281f4d2f4e 100644 --- a/SimDataFormats/TrackerDigiSimLink/src/classes.h +++ b/SimDataFormats/TrackerDigiSimLink/src/classes.h @@ -9,7 +9,7 @@ #include "SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h" #include "SimDataFormats/TrackerDigiSimLink/interface/StripCompactDigiSimLinks.h" -namespace { +namespace SimDataFormats_TrackerDigiSimLink { struct dictionary { edm::Wrapper PixelLink1; edm::Wrapper< std::vector > PixelLink2; diff --git a/SimDataFormats/TrackingAnalysis/src/classes.h b/SimDataFormats/TrackingAnalysis/src/classes.h index b12538e859d15..aa3a79c607e52 100755 --- a/SimDataFormats/TrackingAnalysis/src/classes.h +++ b/SimDataFormats/TrackingAnalysis/src/classes.h @@ -6,10 +6,8 @@ #include "DataFormats/Common/interface/AssociationMapHelpers.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace -{ -struct dictionary -{ +namespace SimDataFormats_TrackingAnalysis { + struct dictionary { TrackingParticle dummy10; TrackingParticleContainer dummy11; TrackingParticleCollection c1; diff --git a/SimDataFormats/TrackingHit/src/classes.h b/SimDataFormats/TrackingHit/src/classes.h index ceb663feb0081..a0031d1b0c7ca 100644 --- a/SimDataFormats/TrackingHit/src/classes.h +++ b/SimDataFormats/TrackingHit/src/classes.h @@ -2,7 +2,7 @@ #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace SimDataFormats_TrackingHit { struct dictionary { PSimHit dummy444; edm::PSimHitContainer sdummy777; diff --git a/SimDataFormats/ValidationFormats/src/classes.h b/SimDataFormats/ValidationFormats/src/classes.h index 56b96d9c78477..3fbe146df460e 100644 --- a/SimDataFormats/ValidationFormats/src/classes.h +++ b/SimDataFormats/ValidationFormats/src/classes.h @@ -7,7 +7,7 @@ #include "SimDataFormats/ValidationFormats/interface/MaterialAccountingDetector.h" #include "SimDataFormats/ValidationFormats/interface/MaterialAccountingTrack.h" -namespace { +namespace SimDataFormats_ValidationFormats { struct dictionary { std::vector dummy1; std::vector dummy2; diff --git a/SimDataFormats/Vertex/src/classes.h b/SimDataFormats/Vertex/src/classes.h index ba9d54befdc16..28295996d3585 100644 --- a/SimDataFormats/Vertex/src/classes.h +++ b/SimDataFormats/Vertex/src/classes.h @@ -5,7 +5,7 @@ #include -namespace { +namespace SimDataFormats_Vertex { struct dictionary { SimVertex dummy33; std::vector dummy333; diff --git a/SimGeneral/TrackingAnalysis/src/classes.h b/SimGeneral/TrackingAnalysis/src/classes.h index 5cb3e4eda4d7f..541c06722aee4 100644 --- a/SimGeneral/TrackingAnalysis/src/classes.h +++ b/SimGeneral/TrackingAnalysis/src/classes.h @@ -3,7 +3,7 @@ #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticleFwd.h" #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h" -namespace { +namespace SimGeneral_TrackingAnalysis { struct dictionary { std::pair dummy13; edm::Wrapper > dummy14; diff --git a/SimTracker/TrackHistory/src/classes.h b/SimTracker/TrackHistory/src/classes.h index 890a64cb40cc5..b5cbae634772a 100644 --- a/SimTracker/TrackHistory/src/classes.h +++ b/SimTracker/TrackHistory/src/classes.h @@ -6,16 +6,13 @@ #include "SimTracker/TrackHistory/interface/VertexCategories.h" -namespace -{ -struct dictionary -{ +namespace SimTracker_TrackHistory { + struct dictionary { // Dictionaires for Track and Vertex categories std::vector dummy01; std::vector dummy02; edm::Wrapper > dummy03; edm::Wrapper > dummy04; -}; + }; } - diff --git a/SimTracker/TrackerHitAssociation/src/classes.h b/SimTracker/TrackerHitAssociation/src/classes.h index f5a26b6aef97e..a6283c2f76bb4 100644 --- a/SimTracker/TrackerHitAssociation/src/classes.h +++ b/SimTracker/TrackerHitAssociation/src/classes.h @@ -6,7 +6,7 @@ #include "DataFormats/TrackerRecHit2D/interface/OmniClusterRef.h" #include "DataFormats/Common/interface/AssociationMap.h" -namespace { +namespace SimTracker_TrackerHitAssociation { struct dictionary { edm::AssociationMap, std::vector, unsigned int > > dummy01; edm::Wrapper, std::vector, unsigned int > > > dummy02; diff --git a/TBDataFormats/EcalTBObjects/src/classes.h b/TBDataFormats/EcalTBObjects/src/classes.h index 58acefc8c0caf..3ea2e74127b4a 100644 --- a/TBDataFormats/EcalTBObjects/src/classes.h +++ b/TBDataFormats/EcalTBObjects/src/classes.h @@ -5,7 +5,7 @@ #include "TBDataFormats/EcalTBObjects/interface/EcalTBHodoscopeRecInfo.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace TBDataFormats_EcalTBObjects { struct dictionary { std::vector vTDC_; std::vector vHplaneRawHits_; diff --git a/TBDataFormats/HcalTBObjects/src/classes.h b/TBDataFormats/HcalTBObjects/src/classes.h index fd945e4d52fdd..00073c145ac2b 100644 --- a/TBDataFormats/HcalTBObjects/src/classes.h +++ b/TBDataFormats/HcalTBObjects/src/classes.h @@ -6,7 +6,7 @@ #include "TBDataFormats/HcalTBObjects/interface/HcalTBParticleId.h" #include "DataFormats/Common/interface/Wrapper.h" -namespace { +namespace TBDataFormats_HcalTBObjects { struct dictionary { edm::Wrapper theTriggerData_; diff --git a/TrackingTools/GsfTracking/src/classes.h b/TrackingTools/GsfTracking/src/classes.h index 61c274588760e..c5b94c36082cc 100644 --- a/TrackingTools/GsfTracking/src/classes.h +++ b/TrackingTools/GsfTracking/src/classes.h @@ -7,7 +7,7 @@ #include "TrackingTools/GsfTracking/interface/GsfTrackConstraintAssociation.h" #include -namespace { +namespace TrackingTools_GsfTracking { struct dictionary { TrajGsfTrackAssociationCollection ttam; diff --git a/TrackingTools/PatternTools/src/classes.h b/TrackingTools/PatternTools/src/classes.h index 37eb294790a60..5565695f5ec20 100644 --- a/TrackingTools/PatternTools/src/classes.h +++ b/TrackingTools/PatternTools/src/classes.h @@ -25,7 +25,7 @@ #include "TrackingTools/PatternTools/interface/TrackConstraintAssociation.h" #include -namespace { +namespace TrackingTools_PatternTools { struct dictionary { std::vector kk; edm::Wrapper > trajCollWrapper; diff --git a/TrackingTools/TrajectoryState/src/classes.h b/TrackingTools/TrajectoryState/src/classes.h index 8e5cc4ce4b324..17a2a8d06ef56 100644 --- a/TrackingTools/TrajectoryState/src/classes.h +++ b/TrackingTools/TrajectoryState/src/classes.h @@ -29,7 +29,7 @@ typedef edm::Ref TrackParamConstraint typedef edm::RefProd TrackParamConstraintAssociationRefProd; typedef edm::RefVector TrackParamConstraintAssociationRefVector; -namespace { +namespace TrackingTools_TrajectoryState { struct dictionary { std::vector jjj2; edm::Wrapper > jjj3; diff --git a/Validation/RecoParticleFlow/src/classes.h b/Validation/RecoParticleFlow/src/classes.h index 0e66734d9f037..ca4baf433d8a0 100644 --- a/Validation/RecoParticleFlow/src/classes.h +++ b/Validation/RecoParticleFlow/src/classes.h @@ -1,9 +1,3 @@ #include "Validation/RecoParticleFlow/interface/TH2Analyzer.h" #include "Validation/RecoParticleFlow/interface/NicePlot.h" #include "Validation/RecoParticleFlow/interface/Comparator.h" - -namespace { - namespace { - - } -}