livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-5232: Do less work inside typeid() calls. 

clang gets nervous about expressions that call functions inside typeid(), even
though these particular typeid() calls are runtime expressions on runtime
values. Extract the offending calls to a previous statement.
meow-7.2.2
Nat Goodspeed 2016-08-30 14:08:32 -04:00
parent c92eb7e591
commit eddce74206
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llcommon/llsingleton.cpp
View File

@ -115,9 +115,10 @@ void LLSingletonBase::pop_initializing()
}
if (list.back() != this)
{
LLSingletonBase* back(list.back());
logerrs("Push/pop mismatch in stack of currently-initializing LLSingletons: ",
demangle(typeid(*this).name()).c_str(), "::getInstance() trying to pop ",
demangle(typeid(*list.back()).name()).c_str());
demangle(typeid(*back).name()).c_str());
}
// Here we're sure that list.back() == this. Whew, pop it.
list.pop_back();
@ -148,7 +149,8 @@ void LLSingletonBase::capture_dependency(EInitState initState)
{
// 'found' is an iterator; *found is an LLSingletonBase*; **found
// is the actual LLSingletonBase instance.
out << demangle(typeid(**found).name()) << " -> ";
LLSingletonBase* foundp(*found);
out << demangle(typeid(*foundp).name()) << " -> ";
}
// We promise to capture dependencies from both the constructor
// and the initSingleton() method, so an LLSingleton's instance