Commit c9a1ed6f authored by Marcin Jerzy Nowak's avatar Marcin Jerzy Nowak Committed by Graeme Stewart
Browse files

fixed error handler for ROOTDEBUG (TrigSerializeResult-00-01-62)

	* src/TrigTSerializer.cxx: fixed error handling so it works
	correctly in ROOT debug mode
	* Tagging TrigSerializeResult-00-01-62


Former-commit-id: 248ddc7d
parent 375059af
......@@ -134,15 +134,25 @@ void TrigTSerializer::add_previous_streamerinfos(){
}
void TrigTSerializer::streamerErrorHandler(int level, bool abort_bool,
const char* location, const char *msg){
s_decodingError = true;
::DefaultErrorHandler(level,abort_bool, location, msg);
if( level > kInfo ) {
//MN: ignore stuff below kWarning
s_decodingError = true;
}
int oldLvl = gErrorIgnoreLevel;
if( gDebug > 0 ) {
gErrorIgnoreLevel = kPrint;
}
::DefaultErrorHandler(level,abort_bool, location, msg);
gErrorIgnoreLevel = oldLvl;
}
void TrigTSerializer::prepareForTBuffer(const std::string &nameOfClass){
m_IgnoreErrLvl = gErrorIgnoreLevel;
gErrorIgnoreLevel = kInfo+1;
//MN: this setting does not play well with ROOTDEBUG:
// gErrorIgnoreLevel = kInfo+1;
//had this class a problem before?
if (m_errCount.find(nameOfClass)!=m_errCount.end()){
gErrorIgnoreLevel = kError+1;
......@@ -150,7 +160,6 @@ void TrigTSerializer::prepareForTBuffer(const std::string &nameOfClass){
s_decodingError = false;
m_defaultHandler = ::SetErrorHandler(streamerErrorHandler);
}
void TrigTSerializer::restoreAfterTBuffer(const std::string &nameOfClass){
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment