Merge Tuple from the trunk

[SVN r67590]
This commit is contained in:
Steven Watanabe
2011-01-02 20:25:11 +00:00
parent e36faf7e25
commit a2c9608ef0
5 changed files with 230 additions and 147 deletions

View File

@ -384,6 +384,8 @@ extract_and_check_delimiter(
if (is.good() && c!=d) {
is.setstate(std::ios::failbit);
}
} else {
is >> std::ws;
}
return is;
}
@ -478,6 +480,8 @@ extract_and_check_delimiter(
if (is.good() && c!=d) {
is.setstate(std::ios::failbit);
}
} else {
is >> std::ws;
}
return is;
}