diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-10-16 21:15:06 +0200 |
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-10-16 21:15:06 +0200 |
| commit | 2c2cada190f03b1312ed925290a4e230088e8910 (patch) | |
| tree | 0c61f381159f00a5fbc8df6e028c9e41603a881c /indra/newview/llcommandlineparser.cpp | |
| parent | 18ade97fa63fad4d456f29429218105bfc34dd80 (diff) | |
| parent | 0f1d345e187c031ead1199c29674e93d922496cc (diff) | |
merged VWR-23459 (fixed crash for certain command line options when compiled against Boost-1.42)
Diffstat (limited to 'indra/newview/llcommandlineparser.cpp')
| -rw-r--r-- | indra/newview/llcommandlineparser.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llcommandlineparser.cpp b/indra/newview/llcommandlineparser.cpp index ee8646aad0..f31ff14df6 100644 --- a/indra/newview/llcommandlineparser.cpp +++ b/indra/newview/llcommandlineparser.cpp @@ -267,7 +267,11 @@ bool LLCommandLineParser::parseAndStoreResults(po::command_line_parser& clp) { clp.options(gOptionsDesc); 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); if(mExtraParser) { |