Mercurial > octave
diff libinterp/corefcn/file-io.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 | 473414a91539 |
| children | 112b20240c87 |
line wrap: on
line diff
--- a/libinterp/corefcn/file-io.cc Fri Jun 17 11:00:11 2016 -0400 +++ b/libinterp/corefcn/file-io.cc Fri Jun 17 13:45:04 2016 -0400 @@ -460,7 +460,7 @@ #if defined (HAVE_ZLIB) if (use_zlib) { - FILE *fptr = gnulib::fopen (fname.c_str (), mode.c_str ()); + FILE *fptr = std::fopen (fname.c_str (), mode.c_str ()); int fd = fileno (fptr); @@ -470,18 +470,18 @@ retval = octave_zstdiostream::create (fname, gzf, fd, md, flt_fmt); else - retval.error (gnulib::strerror (errno)); + retval.error (std::strerror (errno)); } else #endif { - FILE *fptr = gnulib::fopen (fname.c_str (), mode.c_str ()); + FILE *fptr = std::fopen (fname.c_str (), mode.c_str ()); retval = octave_stdiostream::create (fname, fptr, md, flt_fmt); if (! fptr) - retval.error (gnulib::strerror (errno)); + retval.error (std::strerror (errno)); } } @@ -2839,7 +2839,7 @@ octave_value_list retval; - FILE *fid = gnulib::tmpfile (); + FILE *fid = std::tmpfile (); if (fid) { @@ -2856,7 +2856,7 @@ } else { - retval = ovl (-1, gnulib::strerror (errno)); + retval = ovl (-1, std::strerror (errno)); } return retval; @@ -2903,7 +2903,7 @@ if (fd < 0) { retval(0) = fd; - retval(2) = gnulib::strerror (errno); + retval(2) = std::strerror (errno); } else { @@ -2914,7 +2914,7 @@ if (! fid) { retval(0) = -1; - retval(2) = gnulib::strerror (errno); + retval(2) = std::strerror (errno); } else {