Skip to content
Snippets Groups Projects
Commit dc1c0d5b authored by Scott Snyder's avatar Scott Snyder Committed by Graeme Stewart
Browse files

'Workaround for cling crash ROOT-8499.' (HitManagement-00-01-27)

	* Tagging HitManagement-00-01-27.
	* HitManagement/AthenaHitsVector.h,
	HitManagement/AtlasHitsVector.h: Workaround for cling crash
	ROOT-8499.

2016-07-29  scott snyder  <snyder@bnl.gov>

	* Tagging HitManagement-00-01-26.
	* endreq -> endmsg.
parent 67a97303
No related branches found
No related tags found
No related merge requests found
...@@ -55,7 +55,7 @@ public: ...@@ -55,7 +55,7 @@ public:
{ {
IMessageSvc* msgSvc(Athena::getMessageSvc()); IMessageSvc* msgSvc(Athena::getMessageSvc());
MsgStream log(msgSvc, "AthenaHitsVector"); MsgStream log(msgSvc, "AthenaHitsVector");
log << MSG::DEBUG << " initialized." << endreq; log << MSG::DEBUG << " initialized." << endmsg;
m_name = collectionName; m_name = collectionName;
} }
...@@ -150,11 +150,14 @@ public: ...@@ -150,11 +150,14 @@ public:
public: public:
// Hide from cling to avoid crash in 6.08.00. cf. ROOT-8499.
#ifndef __CLING__
// Used to ensure that the DVLInfo gets registered // Used to ensure that the DVLInfo gets registered
// when the dictionary for this class is loaded. // when the dictionary for this class is loaded.
static const std::type_info* initHelper() static const std::type_info* initHelper()
{ return DataModel_detail::DVLInfo<AthenaHitsVector<T> >::initHelper(); }; { return DataModel_detail::DVLInfo<AthenaHitsVector<T> >::initHelper(); };
static const std::type_info* s_info; static const std::type_info* s_info;
#endif
}; };
...@@ -174,10 +177,12 @@ void dvl_makecontainer (size_t nreserve, AthenaHitsVector<T>*& cont) ...@@ -174,10 +177,12 @@ void dvl_makecontainer (size_t nreserve, AthenaHitsVector<T>*& cont)
} }
#ifndef __CLING__
// Ensure that the DVLInfo gets registered // Ensure that the DVLInfo gets registered
// when the dictionary for this class is loaded. // when the dictionary for this class is loaded.
template <class T> template <class T>
const std::type_info* AthenaHitsVector<T>::s_info = AthenaHitsVector<T>::initHelper(); const std::type_info* AthenaHitsVector<T>::s_info = AthenaHitsVector<T>::initHelper();
#endif
#endif #endif
...@@ -56,7 +56,7 @@ public: ...@@ -56,7 +56,7 @@ public:
{ {
IMessageSvc* msgSvc(Athena::getMessageSvc()); IMessageSvc* msgSvc(Athena::getMessageSvc());
MsgStream log(msgSvc, "AtlasHitsVector"); MsgStream log(msgSvc, "AtlasHitsVector");
log << MSG::DEBUG << " initialized AtlasHitVector " << collectionName << endreq; log << MSG::DEBUG << " initialized AtlasHitVector " << collectionName << endmsg;
m_name = collectionName; m_name = collectionName;
m_hitvector.reserve(mySize); m_hitvector.reserve(mySize);
...@@ -163,11 +163,14 @@ protected: ...@@ -163,11 +163,14 @@ protected:
public: public:
// Hide from cling to avoid crash in 6.08.00. cf. ROOT-8499.
#ifndef __CLING__
// Used to ensure that the DVLInfo gets registered // Used to ensure that the DVLInfo gets registered
// when the dictionary for this class is loaded. // when the dictionary for this class is loaded.
static const std::type_info* initHelper() static const std::type_info* initHelper()
{ return DataModel_detail::DVLInfo<AtlasHitsVector<T> >::initHelper(); } { return DataModel_detail::DVLInfo<AtlasHitsVector<T> >::initHelper(); }
static const std::type_info* s_info; static const std::type_info* s_info;
#endif
}; };
...@@ -186,10 +189,12 @@ void dvl_makecontainer (size_t nreserve, AtlasHitsVector<T>*& cont) ...@@ -186,10 +189,12 @@ void dvl_makecontainer (size_t nreserve, AtlasHitsVector<T>*& cont)
} }
#ifndef __CLING__
// Ensure that the DVLInfo gets registered // Ensure that the DVLInfo gets registered
// when the dictionary for this class is loaded. // when the dictionary for this class is loaded.
template <class T> template <class T>
const std::type_info* AtlasHitsVector<T>::s_info = AtlasHitsVector<T>::initHelper(); const std::type_info* AtlasHitsVector<T>::s_info = AtlasHitsVector<T>::initHelper();
#endif
#endif #endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment