Mercurial > octave
diff libinterp/corefcn/oct-stream.cc @ 21567:3d25f9f4a62b
maint: Eliminate Britishicisms in the code.
* oct-stream.cc, __magick_read__.cc, Array.h, flag.m, lines.m, prism.m,
__contour__.m: Use 'optimize' and 'color' rather than British spellings.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 30 Mar 2016 21:35:51 -0700 |
| parents | 02826fb0f261 |
| children | 3d60ed163b70 |
line wrap: on
line diff
--- a/libinterp/corefcn/oct-stream.cc Wed Mar 30 17:28:43 2016 -0700 +++ b/libinterp/corefcn/oct-stream.cc Wed Mar 30 21:35:51 2016 -0700 @@ -1169,7 +1169,7 @@ } } -// Delimited stream, optimised to read strings of characters separated +// Delimited stream, optimized to read strings of characters separated // by single-character delimiters. // // The reason behind this class is that octstream doesn't provide @@ -1194,7 +1194,7 @@ ~delimited_stream (void); - // Called when optimised sequence of get is finished. Ensures that + // Called when optimized sequence of get is finished. Ensures that // there is a remaining delimiter in buf, or loads more data in. void field_done (void) { @@ -3095,7 +3095,7 @@ std::string& val) const { int c1 = std::istream::traits_type::eof (); - std::ostringstream obuf; // Is this optimised for growing? + std::ostringstream obuf; // Is this optimized for growing? while (is && ((c1 = (is && ! is.eof ()) ? is.get_undelim () @@ -3202,7 +3202,7 @@ std::string& val) const { int c1 = std::istream::traits_type::eof (); - std::ostringstream obuf; // Is this optimised for growing? + std::ostringstream obuf; // Is this optimized for growing? while (is && pattern.find (c1 = is.get_undelim ()) != std::string::npos) obuf << static_cast<char> (c1); @@ -3573,7 +3573,7 @@ bool have_delims = false; for (int i = 0; i < last; i += 2) { - std::string param = args(i).xstring_value ("%s: Invalid paramter type <%s> for parameter %d", + std::string param = args(i).xstring_value ("%s: Invalid parameter type <%s> for parameter %d", who.c_str (), args(i).type_name ().c_str (), i/2 + 1); @@ -3733,7 +3733,7 @@ who.c_str ()); } else - error ("%s: unrecognised option '%s'", who.c_str (), param.c_str ()); + error ("%s: unrecognized option '%s'", who.c_str (), param.c_str ()); } whitespace_table = std::string (256, '\0');