Mercurial > octave-nkf
changeset 8023:0ff67bd96f8d
graphics.h.in: replace NPOS with std::string::npos
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 07 Aug 2008 15:41:07 -0400 |
| parents | 9708674ab85d |
| children | dc36eb214129 |
| files | src/ChangeLog src/graphics.h.in |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Aug 07 15:31:49 2008 -0400 +++ b/src/ChangeLog Thu Aug 07 15:41:07 2008 -0400 @@ -9,7 +9,8 @@ lex.l, load-path.cc, load-save.cc, ls-mat-ascii.cc, ls-oct-ascii.cc, oct-stream.cc, octave.cc, variables.cc, ov-fcn-handle.cc, parse.y, pr-output.cc, symtab.cc, sysdep.cc, - utils.cc: Replace all uses of NPOS with std::string::npos. + utils.cc, graphics.h.in: Replace all uses of NPOS with + std::string::npos. * ov.cc (octave_value::idx_type_value): Move definition here. * ov.h: From here.
--- a/src/graphics.h.in Thu Aug 07 15:31:49 2008 -0400 +++ b/src/graphics.h.in Thu Aug 07 15:41:07 2008 -0400 @@ -61,7 +61,7 @@ operator std::string (void) const { return *this; } // Case-insensitive comparison. - bool compare (const std::string& s, size_t limit = NPOS) const + bool compare (const std::string& s, size_t limit = std::string::npos) const { const_iterator p1 = begin (); const_iterator p2 = s.begin (); @@ -77,7 +77,7 @@ *p2++; } - return (limit == NPOS) ? size () == s.size () : k == limit; + return (limit == std::string::npos) ? size () == s.size () : k == limit; } };