Mercurial > octave-nkf
changeset 3741:b65077dfa1b1
[project @ 2000-11-29 16:30:01 by jwe]
| author | jwe |
|---|---|
| date | Wed, 29 Nov 2000 16:30:03 +0000 |
| parents | 0228f57f88c3 |
| children | 078fde449ebc |
| files | liboctave/ChangeLog liboctave/MArray-defs.h src/ChangeLog src/defun-int.h src/defun.h src/input.cc |
| diffstat | 6 files changed, 17 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog Tue Nov 28 02:51:23 2000 +0000 +++ b/liboctave/ChangeLog Wed Nov 29 16:30:03 2000 +0000 @@ -1,3 +1,7 @@ +2000-11-28 John W. Eaton <jwe@bevo.che.wisc.edu> + + * MArray-defs.h: Protect against multiple inclusion. + 2000-11-20 John W. Eaton <jwe@bevo.che.wisc.edu> * data-conv.h (enum save_type): Move LS_U_LONG and LS_LONG to the
--- a/liboctave/MArray-defs.h Tue Nov 28 02:51:23 2000 +0000 +++ b/liboctave/MArray-defs.h Wed Nov 29 16:30:03 2000 +0000 @@ -1,3 +1,6 @@ +#if !defined (octave_MArray_defs_h) +#define octave_MArray_defs_h 1 + // Nothing like a little CPP abuse to brighten everyone's day. #define DO_VS_OP(r, l, v, OP, s) \ @@ -313,3 +316,4 @@ // Now we have all the definitions we need. +#endif
--- a/src/ChangeLog Tue Nov 28 02:51:23 2000 +0000 +++ b/src/ChangeLog Wed Nov 29 16:30:03 2000 +0000 @@ -1,3 +1,9 @@ +2000-11-29 John W. Eaton <jwe@bevo.che.wisc.edu> + + * defun-int.h (UNDERSCORIFY): Omit `##' in macro definition since + they are not needed to paste strings together and picky compilers + choke on them. + 2000-11-17 John W. Eaton <jwe@bevo.che.wisc.edu> * load-save.cc (save_ascii_data_for_plotting): New function.
--- a/src/defun-int.h Tue Nov 28 02:51:23 2000 +0000 +++ b/src/defun-int.h Wed Nov 29 16:30:03 2000 +0000 @@ -160,7 +160,7 @@ install_builtin_constant (name, octave_value (defn), protect, doc) #define UNDERSCORIFY(name) \ - "__" ## name ## "__" + "__" name "__" #define DEFCONST_INTERNAL(name, defn, doc) \ INSTALL_CONST (#name, SBV_ ## name, defn, false, doc); \
--- a/src/defun.h Tue Nov 28 02:51:23 2000 +0000 +++ b/src/defun.h Wed Nov 29 16:30:03 2000 +0000 @@ -60,7 +60,7 @@ // This one can be used when `name' cannot be used directly (if it is // already defined as a macro). In that case, name is already a -// quoted std::string, and the name of the structure has to be passed too. +// quoted string, and the name of the structure has to be passed too. #define DEFCONSTX(name, sname, defn, doc) \ DEFCONSTX_INTERNAL (name, sname, defn, doc)
--- a/src/input.cc Tue Nov 28 02:51:23 2000 +0000 +++ b/src/input.cc Wed Nov 29 16:30:03 2000 +0000 @@ -696,7 +696,7 @@ return retval; } -DEFUN_TEXT(echo, args, , +DEFUN_TEXT (echo, args, , "-*- texinfo -*-\n\ @deffn {Command} echo options\n\ Control whether commands are displayed as they are executed. Valid\n\