Commit 1cee5836 authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[2317] Pass a string object to is_any_of() instead of char* value.

This is a workaround for the warnings on Debian6: "array subscript is
above array bounds".
parent 7d705b35
......@@ -220,12 +220,12 @@ OptionDefinition::validate() const {
if (!all(name_, boost::is_from_range('a', 'z') ||
boost::is_from_range('A', 'Z') ||
boost::is_digit() ||
boost::is_any_of("-_")) ||
boost::is_any_of(std::string("-_"))) ||
name_.empty() ||
// Hyphens and underscores are not allowed at the beginning
// and at the end of the option name.
all(find_head(name_, 1), boost::is_any_of("-_")) ||
all(find_tail(name_, 1), boost::is_any_of("-_"))) {
all(find_head(name_, 1), boost::is_any_of(std::string("-_"))) ||
all(find_tail(name_, 1), boost::is_any_of(std::string("-_")))) {
err_str << "invalid option name '" << name_ << "'";
} else if (type_ >= OPT_UNKNOWN_TYPE) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment