# HG changeset patch # User jwe # Date 1041609333 0 # Node ID 363d406ec86cf1b5bc95aef34eb18c733aea6bdb # Parent 7cd865a8c815e26de2c7f45e3119f962ebac1eb6 [project @ 2003-01-03 15:55:01 by jwe] diff -r 7cd865a8c815 -r 363d406ec86c libcruft/ChangeLog --- a/libcruft/ChangeLog Fri Jan 03 15:27:06 2003 +0000 +++ b/libcruft/ChangeLog Fri Jan 03 15:55:33 2003 +0000 @@ -1,3 +1,8 @@ +2003-01-03 Paul Kienzle + + * misc/quit.h: Move #include outside extern "C" block. + * misc/f77-fcn.h: Move #include "quit.h" outside extern "C" block. + 2002-11-20 John W. Eaton * misc/quit.h (BEGIN_INTERRUPT_WITH_EXCEPTIONS, diff -r 7cd865a8c815 -r 363d406ec86c libcruft/misc/f77-fcn.h --- a/libcruft/misc/f77-fcn.h Fri Jan 03 15:27:06 2003 +0000 +++ b/libcruft/misc/f77-fcn.h Fri Jan 03 15:55:33 2003 +0000 @@ -23,12 +23,12 @@ #if !defined (octave_f77_fcn_h) #define octave_f77_fcn_h 1 +#include "quit.h" + #ifdef __cplusplus extern "C" { #endif -#include "quit.h" - /* Hack to stringize macro results. */ #define xSTRINGIZE(x) #x #define STRINGIZE(x) xSTRINGIZE(x) diff -r 7cd865a8c815 -r 363d406ec86c libcruft/misc/quit.h --- a/libcruft/misc/quit.h Fri Jan 03 15:27:06 2003 +0000 +++ b/libcruft/misc/quit.h Fri Jan 03 15:55:33 2003 +0000 @@ -24,6 +24,7 @@ #define octave_quit_h 1 #ifdef __cplusplus +#include extern "C" { #endif @@ -32,10 +33,6 @@ #include #include -#ifdef __cplusplus -#include -#endif - #if defined (OCTAVE_HAVE_SIG_JUMP) typedef sigjmp_buf octave_jmp_buf; diff -r 7cd865a8c815 -r 363d406ec86c scripts/io/beep.m --- a/scripts/io/beep.m Fri Jan 03 15:27:06 2003 +0000 +++ b/scripts/io/beep.m Fri Jan 03 15:55:33 2003 +0000 @@ -27,6 +27,10 @@ function beep () - puts ("\a"); + if (nargin == 0) + puts ("\a"); + else + usage ("beep ()"); + endif endfunction diff -r 7cd865a8c815 -r 363d406ec86c scripts/miscellaneous/tempname.m --- a/scripts/miscellaneous/tempname.m Fri Jan 03 15:27:06 2003 +0000 +++ b/scripts/miscellaneous/tempname.m Fri Jan 03 15:55:33 2003 +0000 @@ -22,8 +22,8 @@ ## This function is an alias for @code{tmpnam}. ## @end deftypefn -function filename = tempname () +function filename = tempname (varargin) - filename = tmpnam (); + filename = tmpnam (varargin{:}); endfunction diff -r 7cd865a8c815 -r 363d406ec86c src/ChangeLog --- a/src/ChangeLog Fri Jan 03 15:27:06 2003 +0000 +++ b/src/ChangeLog Fri Jan 03 15:55:33 2003 +0000 @@ -1,3 +1,7 @@ +2003-01-03 John W Eaton + + * mappers.cc: Remove std:: qualifiers from C library names. + 2003-01-03 John W. Eaton * pt-exp.h (tree_expression::has_magic_end): New pure virtual function. diff -r 7cd865a8c815 -r 363d406ec86c src/mappers.cc --- a/src/mappers.cc Fri Jan 03 15:27:06 2003 +0000 +++ b/src/mappers.cc Fri Jan 03 15:55:33 2003 +0000 @@ -161,7 +161,7 @@ void install_mapper_functions (void) { - DEFUN_MAPPER (abs, xabs, 0, 0, std::fabs, abs, 0, 0.0, 0.0, 1, 0, + DEFUN_MAPPER (abs, xabs, 0, 0, fabs, abs, 0, 0.0, 0.0, 1, 0, "-*- texinfo -*-\n\ @deftypefn {Mapping Function} {} abs (@var{z})\n\ Compute the magnitude of @var{z}, defined as\n\ @@ -184,7 +184,7 @@ @end example\n\ @end deftypefn"); - DEFUN_MAPPER (acos, 0, 0, 0, std::acos, 0, acos, -1.0, 1.0, 0, 1, + DEFUN_MAPPER (acos, 0, 0, 0, acos, 0, acos, -1.0, 1.0, 0, 1, "-*- texinfo -*-\n\ @deftypefn {Mapping Function} {} acos (@var{x})\n\ Compute the inverse cosine of each element of @var{x}.\n\ @@ -229,7 +229,7 @@ @end example\n\ @end deftypefn"); - DEFUN_MAPPER (asin, 0, 0, 0, std::asin, 0, asin, -1.0, 1.0, 0, 1, + DEFUN_MAPPER (asin, 0, 0, 0, asin, 0, asin, -1.0, 1.0, 0, 1, "-*- texinfo -*-\n\ @deftypefn {Mapping Function} {} asin (@var{x})\n\ Compute the inverse sine of each element of @var{x}.\n\ @@ -241,7 +241,7 @@ Ompute the inverse hyperbolic sine of each element of @var{x}.\n\ @end deftypefn"); - DEFUN_MAPPER (atan, 0, 0, 0, std::atan, 0, atan, 0.0, 0.0, 0, 0, + DEFUN_MAPPER (atan, 0, 0, 0, atan, 0, atan, 0.0, 0.0, 0, 0, "-*- texinfo -*-\n\ @deftypefn {Mapping Function} {} atan (@var{x})\n\ Compute the inverse tangent of each element of @var{x}.\n\ @@ -253,7 +253,7 @@ Compute the inverse hyperbolic tanget of each element of @var{x}.\n\ @end deftypefn"); - DEFUN_MAPPER (ceil, 0, 0, 0, std::ceil, 0, ceil, 0.0, 0.0, 0, 0, + DEFUN_MAPPER (ceil, 0, 0, 0, ceil, 0, ceil, 0.0, 0.0, 0, 0, "-*- texinfo -*-\n\ @deftypefn {Mapping Function} {} ceil (@var{x})\n\ Return the smallest integer not less than @var{x}. If @var{x} is\n\ @@ -275,13 +275,13 @@ @end deftypefn\n\ @seealso{real and imag}"); - DEFUN_MAPPER (cos, 0, 0, 0, std::cos, 0, cos, 0.0, 0.0, 0, 0, + DEFUN_MAPPER (cos, 0, 0, 0, cos, 0, cos, 0.0, 0.0, 0, 0, "-*- texinfo -*-\n\ @deftypefn {Mapping Function} {} cos (@var{x})\n\ Compute the cosine of each element of @var{x}.\n\ @end deftypefn"); - DEFUN_MAPPER (cosh, 0, 0, 0, std::cosh, 0, cosh, 0.0, 0.0, 0, 0, + DEFUN_MAPPER (cosh, 0, 0, 0, cosh, 0, cosh, 0.0, 0.0, 0, 0, "-*- texinfo -*-\n\ @deftypefn {Mapping Function} {} cosh (@var{x})\n\ Compute the hyperbolic cosine of each element of @var{x}.\n\ @@ -327,7 +327,7 @@ \n\ @seealso{erf and erfinv}"); - DEFUN_MAPPER (exp, 0, 0, 0, std::exp, 0, exp, 0.0, 0.0, 0, 0, + DEFUN_MAPPER (exp, 0, 0, 0, exp, 0, exp, 0.0, 0.0, 0, 0, "-*- texinfo -*-\n\ @deftypefn {Mapping Function} {} exp (@var{x})\n\ Compute the exponential of @var{x}. To compute the matrix exponential,\n\ @@ -355,7 +355,7 @@ @code{fix (real (@var{x})) + fix (imag (@var{x})) * I}.\n\ @end deftypefn"); - DEFUN_MAPPER (floor, 0, 0, 0, std::floor, 0, floor, 0.0, 0.0, 0, 0, + DEFUN_MAPPER (floor, 0, 0, 0, floor, 0, floor, 0.0, 0.0, 0, 0, "-*- texinfo -*-\n\ @deftypefn {Mapping Function} {} floor (@var{x})\n\ Return the largest integer not greater than @var{x}. If @var{x} is\n\ @@ -536,7 +536,7 @@ @end deftypefn\n\ @seealso{gamma and gammai}"); - DEFUN_MAPPER (log, 0, 0, 0, std::log, 0, log, 0.0, DBL_MAX, 0, 1, + DEFUN_MAPPER (log, 0, 0, 0, log, 0, log, 0.0, DBL_MAX, 0, 1, "-*- texinfo -*-\n\ @deftypefn {Mapping Function} {} log (@var{x})\n\ Compute the natural logarithm for each element of @var{x}. To compute the\n\ @@ -544,7 +544,7 @@ @end deftypefn\n\ @seealso{log2, log10, logspace, and exp}"); - DEFUN_MAPPER (log10, 0, 0, 0, std::log10, 0, log10, 0.0, DBL_MAX, 0, 1, + DEFUN_MAPPER (log10, 0, 0, 0, log10, 0, log10, 0.0, DBL_MAX, 0, 1, "-*- texinfo -*-\n\ @deftypefn {Mapping Function} {} log10 (@var{x})\n\ Compute the base-10 logarithm for each element of @var{x}.\n\ @@ -589,19 +589,19 @@ For complex arguments, @code{sign} returns @code{x ./ abs (@var{x})}.\n\ @end deftypefn"); - DEFUN_MAPPER (sin, 0, 0, 0, std::sin, 0, sin, 0.0, 0.0, 0, 0, + DEFUN_MAPPER (sin, 0, 0, 0, sin, 0, sin, 0.0, 0.0, 0, 0, "-*- texinfo -*-\n\ @deftypefn {Mapping Function} {} sin (@var{x})\n\ Compute the sin of each element of @var{x}.\n\ @end deftypefn"); - DEFUN_MAPPER (sinh, 0, 0, 0, std::sinh, 0, sinh, 0.0, 0.0, 0, 0, + DEFUN_MAPPER (sinh, 0, 0, 0, sinh, 0, sinh, 0.0, 0.0, 0, 0, "-*- texinfo -*-\n\ @deftypefn {Mapping Function} {} sinh (@var{x})\n\ Compute the inverse hyperbolic sin of each element of @var{x}.\n\ @end deftypefn"); - DEFUN_MAPPER (sqrt, 0, 0, 0, std::sqrt, 0, sqrt, 0.0, DBL_MAX, 0, 1, + DEFUN_MAPPER (sqrt, 0, 0, 0, sqrt, 0, sqrt, 0.0, DBL_MAX, 0, 1, "-*- texinfo -*-\n\ @deftypefn {Mapping Function} {} sqrt (@var{x})\n\ Compute the square root of @var{x}. If @var{x} is negative, a complex\n\ @@ -609,13 +609,13 @@ @ref{Linear Algebra}.\n\ @end deftypefn"); - DEFUN_MAPPER (tan, 0, 0, 0, std::tan, 0, tan, 0.0, 0.0, 0, 0, + DEFUN_MAPPER (tan, 0, 0, 0, tan, 0, tan, 0.0, 0.0, 0, 0, "-*- texinfo -*-\n\ @deftypefn {Mapping Function} {} tan (@var{z})\n\ Compute tanget of each element of @var{x}.\n\ @end deftypefn"); - DEFUN_MAPPER (tanh, 0, 0, 0, std::tanh, 0, tanh, 0.0, 0.0, 0, 0, + DEFUN_MAPPER (tanh, 0, 0, 0, tanh, 0, tanh, 0.0, 0.0, 0, 0, "-*- texinfo -*-\n\ @deftypefn {Mapping Function} {} tanh (@var{x})\n\ Compute hyperbolic tangent of each element of @var{x}.\n\