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

FIRE-15748: Follow-up fix for LSL preprocessor not optimizing out unreferenced functions if files are included; fix by Sei Lisa

Ansariel 2015-03-23 01:18:05 +01:00
parent babb652f48
commit 455ab804eb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/fslslpreproc.cpp
View File

@ -367,9 +367,12 @@ std::string FSLSLPreprocessor::lslopt(std::string script)
std::string funcname = TOPfmatch[2];
// Grab starting position of group 1
S32 pos = TOPfmatch.position(boost::match_results<std::string::const_iterator>::size_type(1));
S32 pos = const_iterator_to_pos(top.begin(), TOPfmatch[1].first);
std::string funcb = scopeript2(top, pos);
functions[funcname] = funcb;
if (functions.find(funcname) != functions.end())
functions[funcname] += funcb; // don't hide duplicate definitions
else
functions[funcname] = funcb;
LL_DEBUGS() << "func " << funcname << " added to list[" << funcb << "]" << LL_ENDL;
top.erase(pos,funcb.size());
search_start = top.begin() + pos;