Merge pull request cms-sw#34190 from guitargeek/ext_hash_map

Replace deprecated ext/hash_map with std::unordered_map

Author: cmsbuild

CalibTracker/SiStripQuality/interface/SiStripQualityHistos.h

@@ -1,10 +1,10 @@
 #ifndef SiStripQualityHistos_H
 #define SiStripQualityHistos_H
 
-#include <ext/hash_map>
+#include <unordered_map>
 #include "TH1F.h"
 
 namespace SiStrip {
-  typedef __gnu_cxx::hash_map<unsigned int, std::shared_ptr<TH1F> > QualityHistosMap;
+  typedef std::unordered_map<unsigned int, std::shared_ptr<TH1F> > QualityHistosMap;
 }
 #endif

CalibTracker/SiStripQuality/plugins/SiStripBadModuleByHandBuilder.h

@@ -11,8 +11,6 @@
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
 #include <vector>
 
-#include <ext/hash_map>
-
 class SiStripBadModuleByHandBuilder : public ConditionDBWriter<SiStripBadStrip> {
 public:
   explicit SiStripBadModuleByHandBuilder(const edm::ParameterSet&);

CondTools/SiPixel/test/SiPixelBadModuleByHandBuilder.h

@@ -14,7 +14,6 @@
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
 #include <vector>
-#include <ext/hash_map>
 
 class SiPixelBadModuleByHandBuilder : public ConditionDBWriter<SiPixelQuality> {
 public:

CondTools/SiStrip/plugins/SiStripBadChannelBuilder.h

@@ -15,7 +15,6 @@
 
 #include <vector>
 #include <memory>
-#include <ext/hash_map>
 
 class SiStripBadChannelBuilder : public ConditionDBWriter<SiStripBadStrip> {
 public:

CondTools/SiStrip/plugins/SiStripBadFiberBuilder.h

@@ -11,8 +11,6 @@
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 #include <vector>
 
-#include <ext/hash_map>
-
 class SiStripBadFiberBuilder : public ConditionDBWriter<SiStripBadStrip> {
 public:
   explicit SiStripBadFiberBuilder(const edm::ParameterSet&);

L1Trigger/GlobalTrigger/interface/L1GtAlgorithmEvaluation.h

@@ -15,45 +15,17 @@
  *
  */
 
-//   for L1GtLogicParser
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerObjectMapFwd.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GtLogicParser.h"
 
-// system include files
 #include <iostream>
-
 #include <map>
 #include <queue>
 #include <stack>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
-// if hash map is used
-
-#include <ext/hash_map>
-
-//   how to hash std::string, using a "template specialization"
-namespace __gnu_cxx {
-
-  /**
- Explicit template specialization of hash of a string class,
- which just uses the internal char* representation as a wrapper.
- */
-  template <>
-  struct hash<std::string> {
-    size_t operator()(const std::string &x) const { return hash<const char *>()(x.c_str()); }
-  };
-
-}  // namespace __gnu_cxx
-// end hash map
-
-// user include files
-
-//   base class
-#include "DataFormats/L1GlobalTrigger/interface/L1GtLogicParser.h"
-
-//
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerObjectMapFwd.h"
-
 // forward declarations
 class L1GtAlgorithm;
 class L1GtConditionEvaluation;
@@ -79,7 +51,7 @@ class L1GtAlgorithmEvaluation {
 
   // typedef std::map<std::string, L1GtConditionEvaluation*>
   // ConditionEvaluationMap;
-  typedef __gnu_cxx ::hash_map<std::string, L1GtConditionEvaluation *> ConditionEvaluationMap;
+  typedef std ::unordered_map<std::string, L1GtConditionEvaluation *> ConditionEvaluationMap;
   typedef ConditionEvaluationMap::const_iterator CItEvalMap;
   typedef ConditionEvaluationMap::iterator ItEvalMap;
 

L1Trigger/GlobalTrigger/src/L1GlobalTriggerGTL.cc

@@ -16,9 +16,6 @@
 // this class header
 #include "L1Trigger/GlobalTrigger/interface/L1GlobalTriggerGTL.h"
 
-// system include files
-#include <ext/hash_map>
-
 // user include files
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerObjectMap.h"
 

L1Trigger/GlobalTrigger/src/L1GtAlgorithmEvaluation.cc

@@ -26,7 +26,6 @@
 #include <iostream>
 
 #include <boost/algorithm/string.hpp>
-#include <ext/hash_map>
 
 // user include files
 

L1Trigger/L1TGlobal/interface/AlgorithmEvaluation.h

@@ -17,45 +17,16 @@
  *
  */
 
-//   for L1GtLogicParser
 #include "DataFormats/L1TGlobal/interface/GlobalLogicParser.h"
+#include "DataFormats/L1TGlobal/interface/GlobalObjectMapFwd.h"
 
-// system include files
 #include <iostream>
-
-#include <string>
-#include <vector>
 #include <map>
-#include <stack>
 #include <queue>
-
-// if hash map is used
-
-#include <ext/hash_map>
-#include "DataFormats/L1TGlobal/interface/GlobalObjectMapFwd.h"
-
-//   how to hash std::string, using a "template specialization"
-// DMP Comment out for not to prevent conflicts
-namespace __gnu_cxx {
-
-  /** 
-      Explicit template specialization of hash of a string class, 
-      which just uses the internal char* representation as a wrapper. 
-      */
-  template <>
-  struct hash<std::string> {
-    size_t operator()(const std::string& x) const { return hash<const char*>()(x.c_str()); }
-  };
-
-}  // namespace __gnu_cxx
-// end hash map
-
-// user include files
-
-//   base class
-#include "DataFormats/L1TGlobal/interface/GlobalLogicParser.h"
-
-//
+#include <stack>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 // forward declarations
 class GlobalAlgorithm;
@@ -84,7 +55,7 @@ namespace l1t {
     // virtual ~AlgorithmEvaluation();
 
     //typedef std::map<std::string, ConditionEvaluation*> ConditionEvaluationMap;
-    typedef __gnu_cxx ::hash_map<std::string, ConditionEvaluation*> ConditionEvaluationMap;
+    typedef std::unordered_map<std::string, ConditionEvaluation*> ConditionEvaluationMap;
     typedef ConditionEvaluationMap::const_iterator CItEvalMap;
     typedef ConditionEvaluationMap::iterator ItEvalMap;
 

L1Trigger/L1TGlobal/src/AlgorithmEvaluation.cc

@@ -25,9 +25,6 @@
 #include <iostream>
 #include <iomanip>
 
-#include <boost/algorithm/string.hpp>
-#include <ext/hash_map>
-
 // user include files
 
 //