Merge doc patches to release; fixes #3992, fixes #4858

[SVN r67034]
This commit is contained in:
Marshall Clow
2010-12-05 20:36:54 +00:00
parent 0c04bde7e0
commit abd32c88fc

View File

@@ -115,7 +115,8 @@ if (vm.count("response-file")) {
ss << ifs.rdbuf();
// Split the file content
char_separator<char> sep(" \n\r");
tokenizer<char_separator<char> > tok(ss.str(), sep);
std::string ResponsefileContents( ss.str() );
tokenizer<char_separator<char> > tok(ResponsefileContents, sep);
vector<string> args;
copy(tok.begin(), tok.end(), back_inserter(args));
// Parse the file and store the options
@@ -295,7 +296,7 @@ void validate(boost::any& v,
if (regex_match(s, match, r)) {
v = any(magic_number(lexical_cast<int>(match[1])));
} else {
throw validation_error("invalid value");
throw validation_error(valodation_error::invalid_option_value);
}
}
]]>