Merge pull request #8078 from Dr15Jones/makeArrayOfCharsConstInTaggin…

…gVariable Make char arrays fully const in TaggingVariable
cms-sw · Mar 5, 2015 · 1b12516 · 1b12516
2 parents 37acadf + 154fa13
commit 1b12516
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/DataFormats/BTauReco/interface/TaggingVariable.h b/DataFormats/BTauReco/interface/TaggingVariable.h
@@ -133,8 +133,8 @@ namespace reco {
   // import only TaggingVariableName type into reco namespace
   using btau::TaggingVariableName;
 
-  extern const char* TaggingVariableDescription[];
-  extern const char* TaggingVariableTokens[];
+  extern const char* const TaggingVariableDescription[];
+  extern const char* const TaggingVariableTokens[];
 
   TaggingVariableName getTaggingVariableName ( const std::string & name );
 

diff --git a/DataFormats/BTauReco/src/TaggingVariable.cc b/DataFormats/BTauReco/src/TaggingVariable.cc
@@ -8,7 +8,7 @@ using namespace std;
 
 namespace reco {
 
-const char* TaggingVariableDescription[] = {
+const char* const TaggingVariableDescription[] = {
   /* [jetEnergy]                                = */ "jet energy",
   /* [jetPt]                                    = */ "jet transverse momentum",
   /* [trackJetPt]                               = */ "track-based jet transverse momentum",
@@ -108,7 +108,7 @@ const char* TaggingVariableDescription[] = {
   /* [lastTaggingVariable]                      = */ ""
 };
 
-const char* TaggingVariableTokens[] = {
+const char* const TaggingVariableTokens[] = {
   /* [jetEnergy]                                = */ "jetEnergy",
   /* [jetPt]                                    = */ "jetPt",
   /* [trackJetPt]                               = */ "trackJetPt",