IDC: Satisfy some thread warnings

Event/EventContainers/EventContainers/IdentifiableContainerBase.h

@@ -7,6 +7,7 @@
 #define EVENTCONTAINERS_IDENTIFIABLECONTAINERBASE_H
 
 #include "EventContainers/IdentifiableCacheBase.h"
+#include "CxxUtils/checker_macros.h"
 
 class IdentifiableContainerBase{
 
@@ -18,11 +19,11 @@ public:
 protected:
     EventContainers::IdentifiableCacheBase *m_cacheLink;
     bool m_OnlineMode;
-    mutable std::atomic<bool> m_waitNeeded;
+    mutable std::atomic<bool> m_waitNeeded ATLAS_THREAD_SAFE; //These mutables are carefully thought out, do not change
     typedef EventContainers::IdentifiableCacheBase IdentifiableCacheBase;
-    mutable std::vector< IdentifierHash > m_waitlist;
-    mutable std::mutex m_waitMutex;
-    mutable std::vector<bool> m_mask;
+    mutable std::vector< IdentifierHash > m_waitlist ATLAS_THREAD_SAFE;
+    mutable std::mutex m_waitMutex ATLAS_THREAD_SAFE;
+    mutable std::vector<bool> m_mask ATLAS_THREAD_SAFE;
     std::vector<IdentifierHash> GetAllCurrentHashes() const;
 
     void Wait() const;

Event/EventContainers/src/IdentifiableCacheBase.cxx

@@ -20,8 +20,8 @@
 
 namespace EventContainers {
 
-static const void* INVALID = reinterpret_cast<const void*>(IdentifiableCacheBase::INVALIDflag);
-static const void* ABORTED = reinterpret_cast<const void*>(IdentifiableCacheBase::ABORTEDflag);
+const void* const INVALID = reinterpret_cast<const void*>(IdentifiableCacheBase::INVALIDflag);
+const void* const ABORTED = reinterpret_cast<const void*>(IdentifiableCacheBase::ABORTEDflag);
 
 IdentifiableCacheBase::IdentifiableCacheBase (IdentifierHash maxHash,
                                               const IMaker* maker)