Merge Tuple from the trunk

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

No files matched your search

+4
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;
}