Merge pull request #1442 from ktf/sr-fix-CondFormats-PhysicsToolsObjects

Multithreading fixes -- Make statics const in CondFormats/PhysicsToolsObjects
cms-sw · Nov 15, 2013 · 2363037 · 2363037
2 parents f447dda + fa6615f
commit 2363037
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/CondFormats/PhysicsToolsObjects/interface/PerformancePayloadFromBinnedTFormula.h b/CondFormats/PhysicsToolsObjects/interface/PerformancePayloadFromBinnedTFormula.h
@@ -15,7 +15,7 @@ class PerformancePayloadFromBinnedTFormula : public PerformancePayload {
 //  class PerformancePayloadFromBinnedTFormula : public PerformancePayload, public PhysicsPerformancePayload {
  public:
 
-  static int InvalidPos;
+  static const int InvalidPos;
 
   PerformancePayloadFromBinnedTFormula(const std::vector<PerformanceResult::ResultType>& r, const std::vector<BinningVariables::BinningVariablesType>& b  , const std::vector<PhysicsTFormulaPayload>& in) : pls(in), results_(r), variables_(b) {}
 

diff --git a/CondFormats/PhysicsToolsObjects/interface/PerformancePayloadFromTFormula.h b/CondFormats/PhysicsToolsObjects/interface/PerformancePayloadFromTFormula.h
@@ -15,7 +15,7 @@ class PerformancePayloadFromTFormula : public PerformancePayload {
 //  class PerformancePayloadFromTFormula : public PerformancePayload, public PhysicsPerformancePayload {
  public:
 
-  static int InvalidPos;
+  static const int InvalidPos;
 
   PerformancePayloadFromTFormula(const std::vector<PerformanceResult::ResultType>& r, const std::vector<BinningVariables::BinningVariablesType>& b  ,  PhysicsTFormulaPayload& in) : pl(in), results_(r), variables_(b) {}
 

diff --git a/CondFormats/PhysicsToolsObjects/interface/PerformancePayloadFromTable.h b/CondFormats/PhysicsToolsObjects/interface/PerformancePayloadFromTable.h
@@ -14,7 +14,7 @@ class PerformancePayloadFromTable : public PerformancePayload {
 //  class PerformancePayloadFromTable : public PerformancePayload, public PhysicsPerformancePayload {
  public:
 
-  static int InvalidPos;
+  static const int InvalidPos;
 
   //PerformancePayloadFromTable(int stride_, std::string columns_,std::vector<float> table) : PerformancePayload(stride_, columns_, table) {}
 

diff --git a/CondFormats/PhysicsToolsObjects/src/PerformancePayloadFromBinnedTFormula.cc b/CondFormats/PhysicsToolsObjects/src/PerformancePayloadFromBinnedTFormula.cc
@@ -1,6 +1,6 @@
 #include "CondFormats/PhysicsToolsObjects/interface/PerformancePayloadFromBinnedTFormula.h"
 
-int PerformancePayloadFromBinnedTFormula::InvalidPos=-1;
+const int PerformancePayloadFromBinnedTFormula::InvalidPos=-1;
 
 #include <iostream>
 using namespace std;

diff --git a/CondFormats/PhysicsToolsObjects/src/PerformancePayloadFromTFormula.cc b/CondFormats/PhysicsToolsObjects/src/PerformancePayloadFromTFormula.cc
@@ -1,6 +1,6 @@
 #include "CondFormats/PhysicsToolsObjects/interface/PerformancePayloadFromTFormula.h"
 
-int PerformancePayloadFromTFormula::InvalidPos=-1;
+const int PerformancePayloadFromTFormula::InvalidPos=-1;
 
 #include <iostream>
 using namespace std;

diff --git a/CondFormats/PhysicsToolsObjects/src/PerformancePayloadFromTable.cc b/CondFormats/PhysicsToolsObjects/src/PerformancePayloadFromTable.cc
@@ -1,6 +1,6 @@
 #include "CondFormats/PhysicsToolsObjects/interface/PerformancePayloadFromTable.h"
 
-int PerformancePayloadFromTable::InvalidPos=-1;
+const int PerformancePayloadFromTable::InvalidPos=-1;
 
 #include <iostream>