Use thread_local storage in CurrentG4Track

Feels dirty, but by far the easiest solution given everything was static already.
hufnagel · Jul 3, 2014 · fb78455 · fb78455
1 parent d87406c
commit fb78455
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/SimG4Core/Notification/interface/CurrentG4Track.h b/SimG4Core/Notification/interface/CurrentG4Track.h
@@ -21,8 +21,8 @@ class CurrentG4Track
     static int id() { check(); return m_track->GetTrackID(); }
     static const G4Track * track() { check(); return m_track; }
 private:
-    static const G4Track * m_track;
-    static bool m_tracking;
+    static thread_local const G4Track * m_track;
+    static thread_local bool m_tracking;
     static void setTrack(const G4Track *);
     static void postTracking(const G4Track *);
     static void check()	

diff --git a/SimG4Core/Notification/src/CurrentG4Track.cc b/SimG4Core/Notification/src/CurrentG4Track.cc
@@ -1,7 +1,7 @@
 #include "SimG4Core/Notification/interface/CurrentG4Track.h"
 
-const G4Track * CurrentG4Track::m_track = 0;
-bool CurrentG4Track::m_tracking = false;
+thread_local const G4Track * CurrentG4Track::m_track = 0;
+thread_local bool CurrentG4Track::m_tracking = false;
 
 void CurrentG4Track::setTrack(const G4Track * t)
 {