Mercurial > octave

diff libinterp/corefcn/oct-stream.cc @ 27102:84ff9953faa1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
where possible, eliminate octave:: namespace qualifier inside octave namespace Affected files: file-editor-tab.cc, file-editor.cc, main-window.cc, octave-cmd.h, octave-qt-link.cc, settings-dialog.cc, call-stack.cc, environment.cc, ft-text-renderer.cc, gl2ps-print.cc, help.cc, input.cc, interpreter-private.cc, interpreter-private.h, interpreter.cc, load-path.cc, oct-hist.cc, oct-process.cc, oct-stream.cc, pager.cc, syminfo.cc, symtab.h, sysdep.cc, text-renderer.cc, utils.cc, gzip.cc, cdef-manager.cc, ov-fcn-handle.cc, ov-java.cc, jit-typeinfo.cc, oct-parse.yy, pt-eval.cc, pt-tm-const.cc, chol.cc, gsvd.cc, oct-rand.cc, oct-rand.h, randmtzig.cc, randpoisson.cc, file-ops.cc, lo-sysdep.cc, file-info.cc, oct-glob.cc, oct-sparse.cc, and url-transfer.cc.
author John W. Eaton <jwe@octave.org>
date Wed, 22 May 2019 13:57:30 +0000
parents 0a62d9a6aa2d
children 8ea53aa9ac39
line wrap: on
line diff
--- a/libinterp/corefcn/oct-stream.cc	Tue May 21 19:50:59 2019 +0000
+++ b/libinterp/corefcn/oct-stream.cc	Wed May 22 13:57:30 2019 +0000
@@ -65,7 +65,7 @@
 {
   // Programming Note: There are two very different error functions used
   // in the stream code.  When invoked with "error (...)" the member
-  // function from octave::stream or octave::base_stream is called.  This
+  // function from stream or base_stream is called.  This
   // function sets the error state on the stream AND returns control to
   // the caller.  The caller must then return a value at the end of the
   // function.  When invoked with "::error (...)" the exception-based
@@ -4546,7 +4546,7 @@
   do                                                                    \
     {                                                                   \
       if (encoding ().compare ("utf-8"))                                \
-        tmp = octave::string::u8_from_encoding (who, tmp, encoding ()); \
+        tmp = string::u8_from_encoding (who, tmp, encoding ());         \
       width = tmp.length ();                                            \
                                                                         \
       if (is)                                                           \
@@ -5553,15 +5553,15 @@
     switch (nsa)
       {
       case 2:
-        retval = octave::format (os, fmt, sa_1, sa_2, arg);
+        retval = format (os, fmt, sa_1, sa_2, arg);
         break;
 
       case 1:
-        retval = octave::format (os, fmt, sa_1, arg);
+        retval = format (os, fmt, sa_1, arg);
         break;
 
       case 0:
-        retval = octave::format (os, fmt, arg);
+        retval = format (os, fmt, arg);
         break;
 
       default: