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

merged VWR-23459 (fixed crash for certain command line options when compiled against Boost-1.42)

master
Boroondas Gupte 2010-10-16 21:15:06 +02:00
parent 18ade97fa6 0f1d345e18
commit 2c2cada190
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -62,6 +62,7 @@ Alejandro Rosenthal
VWR-1184 VWR-1184
Aleric Inglewood Aleric Inglewood
SNOW-522 SNOW-522
SNOW-626
SNOW-756 SNOW-756
SNOW-764 SNOW-764
VWR-10001 VWR-10001

6
indra/newview/llcommandlineparser.cpp
View File

@ -267,7 +267,11 @@ bool LLCommandLineParser::parseAndStoreResults(po::command_line_parser& clp)
{ {
clp.options(gOptionsDesc); clp.options(gOptionsDesc);
clp.positional(gPositionalOptions); clp.positional(gPositionalOptions);
clp.style(po::command_line_style::default_style // SNOW-626: Boost 1.42 erroneously added allow_guessing to the default style
// (see http://groups.google.com/group/boost-list/browse_thread/thread/545d7bf98ff9bb16?fwc=2&pli=1)
// Remove allow_guessing from the default style, because that is not allowed
// when we have options that are a prefix of other options (aka, --help and --helperuri).
clp.style((po::command_line_style::default_style & ~po::command_line_style::allow_guessing)
| po::command_line_style::allow_long_disguise); | po::command_line_style::allow_long_disguise);
if(mExtraParser) if(mExtraParser)
{ {