diff options
| -rw-r--r-- | doc/contributions.txt | 3 | ||||
| -rw-r--r-- | indra/llcommon/lldarray.h | 2 | ||||
| -rw-r--r-- | indra/newview/llcommandlineparser.cpp | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 918f68cb99..c87df74a6b 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -62,6 +62,7 @@ Alejandro Rosenthal VWR-1184 Aleric Inglewood SNOW-522 + SNOW-626 SNOW-756 SNOW-764 VWR-10001 @@ -531,6 +532,7 @@ Pf Shan CT-230 CT-231 CT-321 + SNOW-422 princess niven VWR-5733 CT-85 @@ -645,6 +647,7 @@ Strife Onizuka VWR-183 VWR-2265 VWR-4111 + SNOW-691 Tayra Dagostino SNOW-517 SNOW-543 diff --git a/indra/llcommon/lldarray.h b/indra/llcommon/lldarray.h index a8cd03b42a..131b819c99 100644 --- a/indra/llcommon/lldarray.h +++ b/indra/llcommon/lldarray.h @@ -51,7 +51,7 @@ public: LLDynamicArray(S32 size=0) : std::vector<Type>(size) { if (size < BlockSize) std::vector<Type>::reserve(BlockSize); } - void reset() { std::vector<Type>::resize(0); } + void reset() { std::vector<Type>::clear(); } // ACCESSORS const Type& get(S32 index) const { return std::vector<Type>::operator[](index); } 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) { |