Merge pull request #19664 from davidlange6/clangTidyTest12-readabilit…

…y-static-definition-in-anonymous-namespace clang check readability-static-definition-in-anonymous-namespace
cms-sw · Aug 9, 2017 · cd6df5e · cd6df5e
2 parents fad1d5e + 20a8f21
commit cd6df5e
Show file tree

Hide file tree

Showing 65 changed files with 106 additions and 106 deletions.
diff --git a/Alignment/CommonAlignment/src/AlignableObjectId.cc b/Alignment/CommonAlignment/src/AlignableObjectId.cc
@@ -14,7 +14,7 @@ struct AlignableObjectId::entry {
 
 namespace {
 
-  static constexpr AlignableObjectId::entry entries_RunI[] {
+  constexpr AlignableObjectId::entry entries_RunI[] {
     {align::invalid         , "invalid"},
     {align::AlignableDetUnit, "DetUnit"},
     {align::AlignableDet    , "Det"},
@@ -80,7 +80,7 @@ namespace {
     {align::notfound, 0}
   };
 
-  static constexpr AlignableObjectId::entry entries_PhaseI[] {
+  constexpr AlignableObjectId::entry entries_PhaseI[] {
     {align::invalid         , "invalid"},
     {align::AlignableDetUnit, "DetUnit"},
     {align::AlignableDet    , "Det"},
@@ -146,7 +146,7 @@ namespace {
     {align::notfound, 0}
   };
 
-  static constexpr AlignableObjectId::entry entries_PhaseII[] {
+  constexpr AlignableObjectId::entry entries_PhaseII[] {
     {align::invalid         , "invalid"},
     {align::AlignableDetUnit, "DetUnit"},
     {align::AlignableDet    , "Det"},

diff --git a/Alignment/MuonAlignmentAlgorithms/src/MuonResiduals6DOFrphiFitter.cc b/Alignment/MuonAlignmentAlgorithms/src/MuonResiduals6DOFrphiFitter.cc
@@ -22,7 +22,7 @@ namespace
 
   //const CSCGeometry *cscGeometry;
   //static CSCDetId cscDetId;
-  static double csc_R;
+  double csc_R;
 
 
   double getResidual(double delta_x, double delta_y, double delta_z, 

diff --git a/CommonTools/Utils/src/FormulaEvaluator.cc b/CommonTools/Utils/src/FormulaEvaluator.cc
@@ -559,20 +559,20 @@ namespace {
     return info;
   }
 
-  static const std::string k_log("log");
-  static const std::string k_log10("log10");
-  static const std::string k_TMath__Log("TMath::Log");
+  const std::string k_log("log");
+  const std::string k_log10("log10");
+  const std::string k_TMath__Log("TMath::Log");
   double const kLog10Inv = 1./std::log(10.);
-  static const std::string k_exp("exp");
-  static const std::string k_pow("pow");
-  static const std::string k_TMath__Power("TMath::Power");
-  static const std::string k_max("max");
-  static const std::string k_min("min");
-  static const std::string k_TMath__Max("TMath::Max");
-  static const std::string k_TMath__Min("TMath::Min");
-  static const std::string k_TMath__Erf("TMath::Erf");
-  static const std::string k_erf("erf");
-  static const std::string k_TMath__Landau("TMath::Landau");
+  const std::string k_exp("exp");
+  const std::string k_pow("pow");
+  const std::string k_TMath__Power("TMath::Power");
+  const std::string k_max("max");
+  const std::string k_min("min");
+  const std::string k_TMath__Max("TMath::Max");
+  const std::string k_TMath__Min("TMath::Min");
+  const std::string k_TMath__Erf("TMath::Erf");
+  const std::string k_erf("erf");
+  const std::string k_TMath__Landau("TMath::Landau");
 
 
   EvaluatorInfo 
@@ -660,7 +660,7 @@ namespace {
     return info;
   };
 
-  static ExpressionFinder const s_expressionFinder;
+  ExpressionFinder const s_expressionFinder;
 
 }
 //

diff --git a/DataFormats/Math/src/FastMath.cc b/DataFormats/Math/src/FastMath.cc
@@ -24,6 +24,6 @@ namespace fastmath_details {
 	}
       }
     };
-    static Initatan initAtan;
+    Initatan initAtan;
   }
 }
diff --git a/DataFormats/MuonReco/src/EmulatedME0Segment.cc b/DataFormats/MuonReco/src/EmulatedME0Segment.cc
@@ -49,7 +49,7 @@ namespace{
 };
 
 namespace{
-  static const AlgebraicMatrix theProjectionMatrix = createStaticMatrix();
+  const AlgebraicMatrix theProjectionMatrix = createStaticMatrix();
 };
 
 AlgebraicMatrix EmulatedME0Segment::projectionMatrix() const {

diff --git a/DataFormats/PatCandidates/src/TriggerObjectStandAlone.cc b/DataFormats/PatCandidates/src/TriggerObjectStandAlone.cc
@@ -393,7 +393,7 @@ namespace {
           }
        };
   typedef tbb::concurrent_unordered_map<edm::ParameterSetID, std::vector<std::string>, key_hash> AllLabelsMap;
-  [[cms::thread_safe]] static AllLabelsMap allLabelsMap;
+  [[cms::thread_safe]] AllLabelsMap allLabelsMap;
 }
 
 std::vector<std::string>  const* TriggerObjectStandAlone::allLabels(edm::ParameterSetID const& psetid, const edm::EventBase &event,const edm::TriggerResults &res) const {

diff --git a/DataFormats/PatCandidates/src/VIDCutFlowResult.cc b/DataFormats/PatCandidates/src/VIDCutFlowResult.cc
@@ -2,7 +2,7 @@
 #include "FWCore/Utilities/interface/Exception.h"
 
 namespace {
-  static const std::string empty_str("");
+  const std::string empty_str("");
 }
 
 namespace vid {

diff --git a/FWCore/Common/src/EventBase.cc b/FWCore/Common/src/EventBase.cc
@@ -30,7 +30,7 @@ namespace {
       }
    };
    typedef tbb::concurrent_unordered_map<edm::ParameterSetID, edm::TriggerNames, key_hash> TriggerNamesMap;
-   [[cms::thread_safe]] static TriggerNamesMap triggerNamesMap;
+   [[cms::thread_safe]] TriggerNamesMap triggerNamesMap;
 }
 
 namespace edm

diff --git a/FWCore/Services/plugins/InitRootHandlers.cc b/FWCore/Services/plugins/InitRootHandlers.cc
@@ -149,9 +149,9 @@ namespace {
     kFatal
   };
 
-  static thread_local bool s_ignoreWarnings = false;
+  thread_local bool s_ignoreWarnings = false;
 
-  static bool s_ignoreEverything = false;
+  bool s_ignoreEverything = false;
 
   void RootErrorHandlerImpl(int level, char const* location, char const* message) {
 

diff --git a/FWCore/Utilities/src/typelookup.cc b/FWCore/Utilities/src/typelookup.cc
@@ -60,7 +60,7 @@ namespace {
    // for the strings are assigned at compile time via a macro call
    using TypeNameToValueMap = tbb::concurrent_unordered_map<const char*, const std::type_info*, StringHash, StringEqual>;
 
-   static TypeNameToValueMap& typeNameToValueMap() {
+   TypeNameToValueMap& typeNameToValueMap() {
       static TypeNameToValueMap s_map;
       return s_map;
    }

diff --git a/Fireworks/Geometry/src/FWRecoGeometryESProducer.cc b/Fireworks/Geometry/src/FWRecoGeometryESProducer.cc
@@ -78,7 +78,7 @@ void FWRecoGeometryESProducer::ADD_PIXEL_TOPOLOGY( unsigned int rawid, const Geo
   }                                                                     \
 
 namespace {
-  static const std::array<std::string,3> hgcal_geom_names =  { { "HGCalEESensitive",
+  const std::array<std::string,3> hgcal_geom_names =  { { "HGCalEESensitive",
                                                                  "HGCalHESiliconSensitive",
                                                                  "HGCalHEScintillatorSensitive" } };
 }

diff --git a/Fireworks/ParticleFlow/plugins/FWPFCandidateWithHitsProxyBuilder.cc b/Fireworks/ParticleFlow/plugins/FWPFCandidateWithHitsProxyBuilder.cc
@@ -22,7 +22,7 @@
 
 namespace
 {
-   const static std::string cname("particleFlowRecHitHCALUpgrade");
+   const std::string cname("particleFlowRecHitHCALUpgrade");
 
 void  addLineToLineSet(TEveStraightLineSet* ls, const float* p, int i1, int i2)
 {

diff --git a/GeneratorInterface/AlpgenInterface/src/AlpgenHeader.cc b/GeneratorInterface/AlpgenInterface/src/AlpgenHeader.cc
@@ -134,7 +134,7 @@ namespace {
     { return this->index == index; }
   } 
 
-  static const alpgenParameterNames[] = {
+  const alpgenParameterNames[] = {
     DEFINE_ALPGEN_PARAMETER(ih2),
     DEFINE_ALPGEN_PARAMETER(ebeam),
     DEFINE_ALPGEN_PARAMETER(ndns),

diff --git a/GeneratorInterface/Herwig6Interface/plugins/Herwig6Hadronizer.cc b/GeneratorInterface/Herwig6Interface/plugins/Herwig6Hadronizer.cc
@@ -51,28 +51,28 @@ extern "C" {
 
 // helpers
 namespace {
-	static inline bool call_hwmatch()
+	inline bool call_hwmatch()
 	{
 		int result;
 		hwmatch(&result);
 		return result;
 	}  
-	static inline bool call_hwmsct()
+	inline bool call_hwmsct()
 	{
 		int result;
 		hwmsct(&result);
 		return result;
 	}
 
-	static int pdgToHerwig(int ipdg, char *nwig)
+	int pdgToHerwig(int ipdg, char *nwig)
 	{
 		int iopt = 1;
 		int iwig = 0;
 		hwuidt_(&iopt, &ipdg, &iwig, nwig);
 		return ipdg ? iwig : 0;
 	}
 
-	static bool markStable(int pdgId)
+	bool markStable(int pdgId)
 	{
 		char nwig[9] = "        ";
 		if (!pdgToHerwig(pdgId, nwig))

diff --git a/GeneratorInterface/PomwigInterface/src/PomwigHadronizer.cc b/GeneratorInterface/PomwigInterface/src/PomwigHadronizer.cc
@@ -47,22 +47,22 @@ extern "C" {
 
 // helpers
 namespace {
-	static inline bool call_hwmsct()
+	inline bool call_hwmsct()
 	{
 		int result;
 		hwmsct(&result);
 		return result;
 	}
 
-	static int pdgToHerwig(int ipdg, char *nwig)
+	int pdgToHerwig(int ipdg, char *nwig)
 	{
 		int iopt = 1;
 		int iwig = 0;
 		hwuidt_(&iopt, &ipdg, &iwig, nwig);
 		return ipdg ? iwig : 0;
 	}
 
-	static bool markStable(int pdgId)
+	bool markStable(int pdgId)
 	{
 		char nwig[9] = "        ";
 		if (!pdgToHerwig(pdgId, nwig))

diff --git a/HLTrigger/Timer/test/chrono/src/x86_tsc.cc b/HLTrigger/Timer/test/chrono/src/x86_tsc.cc
@@ -152,7 +152,7 @@ uint64_t serialising_rdtsc_unimplemented(void)
 
 namespace {
 
-  static inline constexpr
+  inline constexpr
   unsigned int _(const char b[4]) {
     return * (unsigned int *)(b);
   }

diff --git a/PhysicsTools/MVAComputer/plugins/ProcTMVA.cc b/PhysicsTools/MVAComputer/plugins/ProcTMVA.cc
@@ -65,7 +65,7 @@ class ProcTMVA : public VarProcessor {
   TString   methodName_t;
 };
 
-static ProcTMVA::Registry registry("ProcTMVA");
+ProcTMVA::Registry registry("ProcTMVA");
 
 ProcTMVA::ProcTMVA(const char *name,
                    const Calibration::ProcExternal *calib,

diff --git a/PhysicsTools/MVAComputer/src/ProcCategory.cc b/PhysicsTools/MVAComputer/src/ProcCategory.cc
@@ -41,7 +41,7 @@ class ProcCategory : public VarProcessor {
 	const Calibration::ProcCategory	*calib;
 };
 
-static ProcCategory::Registry registry("ProcCategory");
+ProcCategory::Registry registry("ProcCategory");
 
 ProcCategory::ProcCategory(const char *name,
                            const Calibration::ProcCategory *calib,

diff --git a/PhysicsTools/MVAComputer/src/ProcClassed.cc b/PhysicsTools/MVAComputer/src/ProcClassed.cc
@@ -38,7 +38,7 @@ class ProcClassed : public VarProcessor {
 	unsigned int	nClasses;
 };
 
-static ProcClassed::Registry registry("ProcClassed");
+ProcClassed::Registry registry("ProcClassed");
 
 ProcClassed::ProcClassed(const char *name,
                          const Calibration::ProcClassed *calib,

diff --git a/PhysicsTools/MVAComputer/src/ProcCount.cc b/PhysicsTools/MVAComputer/src/ProcCount.cc
@@ -34,7 +34,7 @@ class ProcCount : public VarProcessor {
 	virtual void eval(ValueIterator iter, unsigned int n) const override;
 };
 
-static ProcCount::Registry registry("ProcCount");
+ProcCount::Registry registry("ProcCount");
 
 ProcCount::ProcCount(const char *name,
                           const Calibration::ProcCount *calib,

diff --git a/PhysicsTools/MVAComputer/src/ProcForeach.cc b/PhysicsTools/MVAComputer/src/ProcForeach.cc
@@ -60,7 +60,7 @@ class ProcForeach : public VarProcessor {
 	unsigned int		count;
 };
 
-static ProcForeach::Registry registry("ProcForeach");
+ProcForeach::Registry registry("ProcForeach");
 
 ProcForeach::ProcForeach(const char *name,
                          const Calibration::ProcForeach *calib,

diff --git a/PhysicsTools/MVAComputer/src/ProcLikelihood.cc b/PhysicsTools/MVAComputer/src/ProcLikelihood.cc
@@ -118,7 +118,7 @@ class ProcLikelihood : public VarProcessor {
 	unsigned int		nCategories;
 };
 
-static ProcLikelihood::Registry registry("ProcLikelihood");
+ProcLikelihood::Registry registry("ProcLikelihood");
 
 double ProcLikelihood::SplinePDF::eval(double value) const
 {

diff --git a/PhysicsTools/MVAComputer/src/ProcLinear.cc b/PhysicsTools/MVAComputer/src/ProcLinear.cc
@@ -41,7 +41,7 @@ class ProcLinear : public VarProcessor {
 	double			offset;
 };
 
-static ProcLinear::Registry registry("ProcLinear");
+ProcLinear::Registry registry("ProcLinear");
 
 ProcLinear::ProcLinear(const char *name,
                        const Calibration::ProcLinear *calib,

diff --git a/PhysicsTools/MVAComputer/src/ProcMLP.cc b/PhysicsTools/MVAComputer/src/ProcMLP.cc
@@ -61,7 +61,7 @@ class ProcMLP : public VarProcessor {
 	unsigned int		maxTmp;
 };
 
-static ProcMLP::Registry registry("ProcMLP");
+ProcMLP::Registry registry("ProcMLP");
 
 ProcMLP::Layer::Layer(const Calibration::ProcMLP::Layer &calib) :
 	inputs(calib.first.front().second.size()),

diff --git a/PhysicsTools/MVAComputer/src/ProcMatrix.cc b/PhysicsTools/MVAComputer/src/ProcMatrix.cc
@@ -60,7 +60,7 @@ class ProcMatrix : public VarProcessor {
 	Matrix	matrix;
 };
 
-static ProcMatrix::Registry registry("ProcMatrix");
+ProcMatrix::Registry registry("ProcMatrix");
 
 ProcMatrix::ProcMatrix(const char *name,
                        const Calibration::ProcMatrix *calib,

diff --git a/PhysicsTools/MVAComputer/src/ProcMultiply.cc b/PhysicsTools/MVAComputer/src/ProcMultiply.cc
@@ -47,7 +47,7 @@ class ProcMultiply : public VarProcessor {
 	std::vector<Config>			out;
 };
 
-static ProcMultiply::Registry registry("ProcMultiply");
+ProcMultiply::Registry registry("ProcMultiply");
 
 ProcMultiply::ProcMultiply(const char *name,
                        const Calibration::ProcMultiply *calib,

diff --git a/PhysicsTools/MVAComputer/src/ProcNormalize.cc b/PhysicsTools/MVAComputer/src/ProcNormalize.cc
@@ -64,7 +64,7 @@ class ProcNormalize : public VarProcessor {
 	unsigned int		nCategories;
 };
 
-static ProcNormalize::Registry registry("ProcNormalize");
+ProcNormalize::Registry registry("ProcNormalize");
 
 ProcNormalize::ProcNormalize(const char *name,
                              const Calibration::ProcNormalize *calib,

diff --git a/PhysicsTools/MVAComputer/src/ProcOptional.cc b/PhysicsTools/MVAComputer/src/ProcOptional.cc
@@ -39,7 +39,7 @@ class ProcOptional : public VarProcessor {
 	std::vector<double>	neutralPos;
 };
 
-static ProcOptional::Registry registry("ProcOptional");
+ProcOptional::Registry registry("ProcOptional");
 
 ProcOptional::ProcOptional(const char *name,
                           const Calibration::ProcOptional *calib,

diff --git a/PhysicsTools/MVAComputer/src/ProcSort.cc b/PhysicsTools/MVAComputer/src/ProcSort.cc
@@ -49,7 +49,7 @@ class ProcSort : public VarProcessor {
 	bool		descending;
 };
 
-static ProcSort::Registry registry("ProcSort");
+ProcSort::Registry registry("ProcSort");
 
 ProcSort::ProcSort(const char *name,
                    const Calibration::ProcSort *calib,

diff --git a/PhysicsTools/MVAComputer/src/ProcSplitter.cc b/PhysicsTools/MVAComputer/src/ProcSplitter.cc
@@ -40,7 +40,7 @@ class ProcSplitter : public VarProcessor {
 	unsigned int	count;
 };
 
-static ProcSplitter::Registry registry("ProcSplitter");
+ProcSplitter::Registry registry("ProcSplitter");
 
 ProcSplitter::ProcSplitter(const char *name,
                           const Calibration::ProcSplitter *calib,

diff --git a/PhysicsTools/MVATrainer/plugins/ProcMLP.cc b/PhysicsTools/MVATrainer/plugins/ProcMLP.cc
@@ -72,7 +72,7 @@ class ProcMLP : public TrainProcessor {
 	double			limiter;
 };
 
-static ProcMLP::Registry registry("ProcMLP");
+ProcMLP::Registry registry("ProcMLP");
 
 ProcMLP::ProcMLP(const char *name, const AtomicId *id,
                  MVATrainer *trainer) :

diff --git a/PhysicsTools/MVATrainer/plugins/ProcTMVA.cc b/PhysicsTools/MVATrainer/plugins/ProcTMVA.cc
@@ -104,7 +104,7 @@ class ProcTMVA : public TrainProcessor {
 	std::string			setupOptions;	// training/test tree TMVA setup options
 };
 
-static ProcTMVA::Registry registry("ProcTMVA");
+ProcTMVA::Registry registry("ProcTMVA");
 
 ProcTMVA::ProcTMVA(const char *name, const AtomicId *id,
                    MVATrainer *trainer) :
@@ -215,7 +215,7 @@ bool ProcTMVA::load()
 	return true;
 }
 
-static std::size_t getStreamSize(std::ifstream &in)
+std::size_t getStreamSize(std::ifstream &in)
 {
 	std::ifstream::pos_type begin = in.tellg();
 	in.seekg(0, std::ios::end);
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,6 @@ namespace fastmath_details { @@
     	}
           }
         };
-        static Initatan initAtan;
+        Initatan initAtan;
       }
     }