Mercurial > octave
diff libinterp/parse-tree/lex.ll @ 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 | d92dcbcd7691 |
| children | 112b20240c87 |
line wrap: on
line diff
--- a/libinterp/parse-tree/lex.ll Fri Jun 17 11:00:11 2016 -0400 +++ b/libinterp/parse-tree/lex.ll Fri Jun 17 13:45:04 2016 -0400 @@ -131,16 +131,6 @@ #define YY_NO_UNISTD_H 1 #define isatty octave_isatty_wrapper -#if defined (GNULIB_NAMESPACE) -// Calls to the following functions appear in the generated output from -// flex without the namespace tag. Redefine them so we will use them -// via the gnulib namespace. -# define fprintf GNULIB_NAMESPACE::fprintf -# define fwrite GNULIB_NAMESPACE::fwrite -# define malloc GNULIB_NAMESPACE::malloc -# define realloc GNULIB_NAMESPACE::realloc -#endif - #if ! (defined (FLEX_SCANNER) \ && defined (YY_FLEX_MAJOR_VERSION) && YY_FLEX_MAJOR_VERSION >= 2 \ && defined (YY_FLEX_MINOR_VERSION) && YY_FLEX_MINOR_VERSION >= 5) @@ -1806,19 +1796,19 @@ void * octave_alloc (yy_size_t size, yyscan_t) { - return malloc (size); + return std::malloc (size); } void * octave_realloc (void *ptr, yy_size_t size, yyscan_t) { - return realloc (ptr, size); + return std::realloc (ptr, size); } void octave_free (void *ptr, yyscan_t) { - free (ptr); + std::free (ptr); } static void