Mercurial > octave
diff liboctave/util/cmd-edit.cc @ 21942:aab79a1885cc
limit gnulib headers to liboctave/wrappers directory
* libinterp/module.mk, liboctave/module.mk, src/module.mk,
libgui/src/module.mk: Don't include libgnu directory in lists of
include directories.
* c-file-ptr-stream.cc, data.cc, dirfns.cc, file-io.cc,
ft-text-renderer.cc, gcd.cc, gl2ps-print.cc, graphics.cc, mex.cc,
oct-fstrm.cc, oct-procbuf.cc, oct-tex-lexer.in.ll,
oct-tex-parser.in.yy, pr-output.cc, quadcc.cc, rand.cc, toplev.cc,
utils.cc, __delaunayn__.cc, __init_fltk__.cc, __voronoi__.cc,
convhulln.cc, ov-cell.cc, ov-float.cc, ov-scalar.cc, lex.ll,
oct-parse.in.yy, Range.cc, idx-vector.cc, Faddeeva/Faddeeva.cc,
lo-mappers.cc, lo-specfun.cc, randgamma.cc, randmtzig.cc,
randpoisson.cc, dir-ops.cc, file-ops.cc, file-stat.cc, oct-env.cc,
oct-syscalls.cc, oct-time.cc, oct-uname.cc, cmd-edit.cc, cmd-hist.cc,
lo-utils.cc, oct-inttypes.cc, oct-shlib.cc, sparse-util.cc,
mkoctfile.in.cc: Use std:: instead of gnulib:: namespace.
* oct-conf-post.in.h: Don't define GNULIB_NAMESPACE.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 17 Jun 2016 13:45:04 -0400 |
| parents | 4d723ba06b4a |
| children | 4b2eab5d2a6a |
line wrap: on
line diff
--- a/liboctave/util/cmd-edit.cc Fri Jun 17 11:00:11 2016 -0400 +++ b/liboctave/util/cmd-edit.cc Fri Jun 17 13:45:04 2016 -0400 @@ -819,7 +819,7 @@ if (len > 0) { - retval = static_cast<char *> (gnulib::malloc (len+1)); + retval = static_cast<char *> (std::malloc (len+1)); strcpy (retval, tmp.c_str ()); } @@ -840,7 +840,7 @@ if (len > 0) { - retval = static_cast<char *> (gnulib::malloc (len+1)); + retval = static_cast<char *> (std::malloc (len+1)); strcpy (retval, tmp.c_str ()); } @@ -861,7 +861,7 @@ if (len > 0) { - retval = static_cast<char *> (gnulib::malloc (len+1)); + retval = static_cast<char *> (std::malloc (len+1)); strcpy (retval, tmp.c_str ()); } @@ -953,8 +953,8 @@ std::string default_command_editor::do_readline (const std::string& prompt, bool& eof) { - gnulib::fputs (prompt.c_str (), output_stream); - gnulib::fflush (output_stream); + std::fputs (prompt.c_str (), output_stream); + std::fflush (output_stream); return octave_fgetl (input_stream, eof); } @@ -1902,7 +1902,7 @@ void command_editor::error (int err_num) { - (*current_liboctave_error_handler) ("%s", gnulib::strerror (err_num)); + (*current_liboctave_error_handler) ("%s", std::strerror (err_num)); } void