Skip to content

Commit abd32c8

Browse files
committed
Merge doc patches to release; fixes #3992, fixes #4858
[SVN r67034]
1 parent 0c04bde commit abd32c8

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

doc/howto.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ if (vm.count("response-file")) {
115115
ss << ifs.rdbuf();
116116
// Split the file content
117117
char_separator<char> sep(" \n\r");
118-
tokenizer<char_separator<char> > tok(ss.str(), sep);
118+
std::string ResponsefileContents( ss.str() );
119+
tokenizer<char_separator<char> > tok(ResponsefileContents, sep);
119120
vector<string> args;
120121
copy(tok.begin(), tok.end(), back_inserter(args));
121122
// Parse the file and store the options
@@ -295,7 +296,7 @@ void validate(boost::any& v,
295296
if (regex_match(s, match, r)) {
296297
v = any(magic_number(lexical_cast<int>(match[1])));
297298
} else {
298-
throw validation_error("invalid value");
299+
throw validation_error(valodation_error::invalid_option_value);
299300
}
300301
}
301302
]]>

0 commit comments

Comments
 (0)