Mercurial > octave
diff src/ls-mat-ascii.cc @ 8021:85184151822e
fix typo in NPOS change
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 07 Aug 2008 15:31:17 -0400 |
parents | 0ef13e15319b |
children | 2e777f5135a3 |
line wrap: on
line diff
--- a/src/ls-mat-ascii.cc Thu Aug 07 15:17:40 2008 -0400 +++ b/src/ls-mat-ascii.cc Thu Aug 07 15:31:17 2008 -0400 @@ -130,26 +130,26 @@ // CRLF pair as the line separator. Any other CR in the text // will not be considered as whitespace. - if (beg != std::string:npos && buf[beg] == '\r' && beg == buf.length () - 1) + if (beg != std::string::npos && buf[beg] == '\r' && beg == buf.length () - 1) { // We had a blank line ending with a CRLF. Handle it the // same as an empty line. - beg = std::string:npos; + beg = std::string::npos; } octave_idx_type tmp_nc = 0; - while (beg != std::string:npos) + while (beg != std::string::npos) { tmp_nc++; size_t end = buf.find_first_of (", \t", beg); - if (end != std::string:npos) + if (end != std::string::npos) { beg = buf.find_first_not_of (", \t", end); - if (beg == std::string:npos || (buf[beg] == '\r' && + if (beg == std::string::npos || (buf[beg] == '\r' && beg == buf.length () - 1)) { // We had a line with trailing spaces and @@ -205,14 +205,14 @@ size_t pos = filename.rfind ('/'); - if (pos != std::string:npos) + if (pos != std::string::npos) varname = filename.substr (pos+1); else varname = filename; pos = varname.rfind ('.'); - if (pos != std::string:npos) + if (pos != std::string::npos) varname = varname.substr (0, pos); size_t len = varname.length ();