King_DuckZ/Loki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Back to revision 1109. Accidentally checked in more files than I intended.

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@1111 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
rich_sposato 2011-09-20 23:19:14 +00:00
parent 16094ffe39
commit ca6a94ac97
16 changed files with 344 additions and 450 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/loki/flex/flex_string_shell.h
View file

@ -1339,17 +1339,17 @@ getline(
typename flex_string<E, T, A, S>::value_type delim)
{
size_t nread = 0;
typename std::basic_istream<typename flex_string<E, T, A, S>::value_type,
typename basic_istream<typename flex_string<E, T, A, S>::value_type,
typename flex_string<E, T, A, S>::traits_type>::sentry sentry(is, true);
if (sentry) {
::std::basic_streambuf<typename flex_string<E, T, A, S>::value_type,
basic_streambuf<typename flex_string<E, T, A, S>::value_type,
typename flex_string<E, T, A, S>::traits_type>* buf = is.rdbuf();
str.clear();
while (nread < str.max_size()) {
int c1 = buf->sbumpc();
if (flex_string<E, T, A, S>::traits_type::eq_int_type(c1, flex_string<E, T, A, S>::traits_type::eof())) {
is.setstate(::std::ios_base::eofbit);
is.setstate(ios_base::eofbit);
break;
}
else {
@ -1363,7 +1363,7 @@ getline(
}
}
if (nread == 0 || nread >= str.max_size())
is.setstate(::std::ios_base::failbit);
is.setstate(ios_base::failbit);
return is;
}