Mercurial > hg > octave-nkf
changeset 15421:cd6ce11b9c57
backout changeset 2e5ba861898f
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 19 Sep 2012 15:13:19 -0400 |
parents | 1249a615c91b |
children | 57e685d135ec |
files | libinterp/interp-core/defun-dld.h libinterp/interp-core/defun-int.h |
diffstat | 2 files changed, 6 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/interp-core/defun-dld.h +++ b/libinterp/interp-core/defun-dld.h @@ -57,14 +57,14 @@ #else #define DEFUN_DLD(name, args_name, nargout_name, doc) \ - DECLARE_FUN_NO_DEFAULTS (name, args_name, nargout_name); \ + DECLARE_FUN (name, args_name, nargout_name); \ DEFINE_FUN_INSTALLER_FUN (name, doc) \ - DECLARE_FUN_NO_DEFAULTS (name, args_name, nargout_name) + DECLARE_FUN (name, args_name, nargout_name) #define DEFUNX_DLD(name, fname, gname, args_name, nargout_name, doc) \ - DECLARE_FUNX_NO_DEFAULTS (fname, args_name, nargout_name); \ + DECLARE_FUNX (fname, args_name, nargout_name); \ DEFINE_FUNX_INSTALLER_FUN (name, fname, gname, doc) \ - DECLARE_FUNX_NO_DEFAULTS (fname, args_name, nargout_name) + DECLARE_FUNX (fname, args_name, nargout_name) #endif
--- a/libinterp/interp-core/defun-int.h +++ b/libinterp/interp-core/defun-int.h @@ -77,23 +77,13 @@ extern OCTINTERP_API void defun_isargout (int, int, bool *); -#define DECLARE_FUNXX(name, args_decl, nargout_decl) \ - OCTAVE_EXPORT octave_value_list name (args_decl, nargout_decl) - #define DECLARE_FUNX(name, args_name, nargout_name) \ - DECLARE_FUNXX (name, \ - const octave_value_list& args_name = octave_value_list (), \ - int nargout_name = 0) - -#define DECLARE_FUNX_NO_DEFAULTS(name, args_name, nargout_name) \ - DECLARE_FUNXX (name, const octave_value_list& args_name, int nargout_name) + OCTAVE_EXPORT octave_value_list \ + name (const octave_value_list& args_name, int nargout_name) #define DECLARE_FUN(name, args_name, nargout_name) \ DECLARE_FUNX (F ## name, args_name, nargout_name) -#define DECLARE_FUN_NO_DEFAULTS(name, args_name, nargout_name) \ - DECLARE_FUNX_NO_DEFAULTS (F ## name, args_name, nargout_name) - // Define the code that will be used to insert the new function into // the symbol table. We look for this name instead of the actual // function so that we can easily install the doc std::string too.