Changeset 105 for MEMPHYS/HEAD

Timestamp:

Jan 25, 2006, 4:11:50 PM (18 years ago)

Author:

campagne

Message:

no more non standard hash_map and static

File:

• MEMPHYS/HEAD/MEMPHYS/DetectorConstruction.hh (modified) (5 diffs)

MEMPHYS/HEAD/MEMPHYS/DetectorConstruction.hh

@@ -13 +13 @@
 #include <fstream>
 #include <map>
-#include <hash_map.h>
-
+#include <string>
 
 class G4Box;
@@ -25 +24 @@
 
 
-//JEC FIXME does it runs on over plateform?
-// look in /usr/include/c++/3.2.3/ext/
-namespace __gnu_cxx {
-  template<> struct hash< std::string >
-  {
-    size_t operator()( const std::string& x ) const {
-      return hash< const char* >()( x.c_str() );
-    }
-  };
-}
 
 namespace AIDA {
@@ -73 +62 @@
 
   // Related to the WC tube IDs
-  //JEC 25/1/06 no more static functions
-  G4int GetTubeID(std::string tubeTag){return tubeLocationMap[tubeTag];}
+  //JEC 25/1/06 no more static functions + const char*
+  G4int GetTubeID(std::string tubeTag);
   G4Transform3D GetTubeTransform(int tubeNo){return tubeIDMap[tubeNo];}
 
@@ -89 +78 @@
 
   typedef void (DetectorConstruction::*DescriptionFcnPtr) (G4VPhysicalVolume*, 
-                                                                  int, int, const G4Transform3D&);
+                                                           int, int, const G4Transform3D&);
 
   // Now Funcs for traversing the geometry
@@ -173 +162 @@
 
   // Tube map information
-  //JEC FIXME: why it works wo using std::hash_map and std::hash?
   //JEC 25/1/06 no more static variables
   std::map<int, G4Transform3D> tubeIDMap;
   std::map<int, cyl_location> tubeCylLocation;
-  hash_map<std::string, int, hash<std::string> >  tubeLocationMap;
+  std::map<std::string, int>  tubeLocationMap; //JEC 25/1/06 use a map standard
 
   // Variable related to the rock