diff liboctave/system/file-ops.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 bac0d6f07a3e
line wrap: on
line diff
--- a/liboctave/system/file-ops.cc	Fri Jun 17 11:00:11 2016 -0400
+++ b/liboctave/system/file-ops.cc	Fri Jun 17 13:45:04 2016 -0400
@@ -414,7 +414,7 @@
       int status = octave_mkdir_wrapper (name.c_str (), mode);
 
       if (status < 0)
-        msg = gnulib::strerror (errno);
+        msg = std::strerror (errno);
 
       return status;
     }
@@ -434,7 +434,7 @@
       int status = octave_mkfifo_wrapper (name.c_str (), mode);
 
       if (status < 0)
-        msg = gnulib::strerror (errno);
+        msg = std::strerror (errno);
 
       return status;
     }
@@ -457,7 +457,7 @@
       status = octave_link_wrapper (old_name.c_str (), new_name.c_str ());
 
       if (status < 0)
-        msg = gnulib::strerror (errno);
+        msg = std::strerror (errno);
 
       return status;
     }
@@ -480,7 +480,7 @@
       status = octave_symlink_wrapper (old_name.c_str (), new_name.c_str ());
 
       if (status < 0)
-        msg = gnulib::strerror (errno);
+        msg = std::strerror (errno);
 
       return status;
     }
@@ -502,7 +502,7 @@
       char *buf = octave_areadlink_wrapper (path.c_str ());
 
       if (! buf)
-        msg = gnulib::strerror (errno);
+        msg = std::strerror (errno);
       else
         {
           result = buf;
@@ -527,10 +527,10 @@
 
       msg = "";
 
-      status = gnulib::rename (from.c_str (), to.c_str ());
+      status = std::rename (from.c_str (), to.c_str ());
 
       if (status < 0)
-        msg = gnulib::strerror (errno);
+        msg = std::strerror (errno);
 
       return status;
     }
@@ -552,7 +552,7 @@
       status = octave_rmdir_wrapper (name.c_str ());
 
       if (status < 0)
-        msg = gnulib::strerror (errno);
+        msg = std::strerror (errno);
 
       return status;
     }
@@ -657,7 +657,7 @@
       status = octave_unlink_wrapper (name.c_str ());
 
       if (status < 0)
-        msg = gnulib::strerror (errno);
+        msg = std::strerror (errno);
 
       return status;
     }
@@ -704,7 +704,7 @@
       strcpy (tname, templatename.c_str ());
 
       if (octave_gen_tempname_wrapper (tname) == -1)
-        msg = gnulib::strerror (errno);
+        msg = std::strerror (errno);
       else
         retval = tname;
 
@@ -739,7 +739,7 @@
 #endif
 
       if (retval.empty ())
-        msg = gnulib::strerror (errno);
+        msg = std::strerror (errno);
 
       return retval;
     }