Mercurial > octave
changeset 29964:bdf99bc91d94
Make sure octave namespace begin and end tags appear in matching pairs.
* libinterp/corefcn/__magick_read__.cc, libinterp/dldfcn/__delaunayn__.cc,
libinterp/dldfcn/__ode15__.cc, libinterp/dldfcn/__voronoi__.cc: Make sure
OCTAVE_NAMESPACE_BEGIN and OCTAVE_NAMESPACE_END are contained in the same code
block surrounded by pre-processor conditions.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sun, 15 Aug 2021 12:33:22 +0200 |
| parents | 00f871ed7aa2 |
| children | 96eb9a6f868b |
| files | libinterp/corefcn/__magick_read__.cc libinterp/dldfcn/__delaunayn__.cc libinterp/dldfcn/__ode15__.cc libinterp/dldfcn/__voronoi__.cc |
| diffstat | 4 files changed, 32 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/__magick_read__.cc Sun Aug 15 12:29:18 2021 +0200 +++ b/libinterp/corefcn/__magick_read__.cc Sun Aug 15 12:33:22 2021 +0200 @@ -824,8 +824,12 @@ } } +OCTAVE_NAMESPACE_END + #endif +OCTAVE_NAMESPACE_BEGIN + DEFUN (__magick_read__, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {[@var{img}, @var{map}, @var{alpha}] =} __magick_read__ (@var{fname}, @var{options}) @@ -950,8 +954,12 @@ %!assert (1) */ +OCTAVE_NAMESPACE_END + #if defined (HAVE_MAGICK) +OCTAVE_NAMESPACE_BEGIN + template <typename T> static uint32NDArray img_float2uint (const T& img) @@ -1477,8 +1485,12 @@ } } +OCTAVE_NAMESPACE_END + #endif +OCTAVE_NAMESPACE_BEGIN + DEFUN (__magick_write__, args, , doc: /* -*- texinfo -*- @deftypefn {} {} __magick_write__ (@var{fname}, @var{fmt}, @var{img}, @var{map}, @var{options}) @@ -1733,8 +1745,12 @@ #endif } +OCTAVE_NAMESPACE_END + #if defined (HAVE_MAGICK) +OCTAVE_NAMESPACE_BEGIN + static octave_value magick_to_octave_value (const Magick::CompressionType& magick) { @@ -1899,8 +1915,12 @@ return; } +OCTAVE_NAMESPACE_END + #endif +OCTAVE_NAMESPACE_BEGIN + DEFUN (__magick_finfo__, args, , doc: /* -*- texinfo -*- @deftypefn {} {} __magick_finfo__ (@var{fname})
--- a/libinterp/dldfcn/__delaunayn__.cc Sun Aug 15 12:29:18 2021 +0200 +++ b/libinterp/dldfcn/__delaunayn__.cc Sun Aug 15 12:33:22 2021 +0200 @@ -98,8 +98,12 @@ return true; } +OCTAVE_NAMESPACE_END + #endif +OCTAVE_NAMESPACE_BEGIN + DEFUN_DLD (__delaunayn__, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{T} =} __delaunayn__ (@var{pts})
--- a/libinterp/dldfcn/__ode15__.cc Sun Aug 15 12:29:18 2021 +0200 +++ b/libinterp/dldfcn/__ode15__.cc Sun Aug 15 12:33:22 2021 +0200 @@ -1243,8 +1243,12 @@ return retval; } +OCTAVE_NAMESPACE_END + #endif +OCTAVE_NAMESPACE_BEGIN + DEFUN_DLD (__ode15__, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{t}, @var{y} =} __ode15__ (@var{fun}, @var{tspan}, @var{y0}, @var{yp0}, @var{options}, @var{num_event_args})
--- a/libinterp/dldfcn/__voronoi__.cc Sun Aug 15 12:29:18 2021 +0200 +++ b/libinterp/dldfcn/__voronoi__.cc Sun Aug 15 12:33:22 2021 +0200 @@ -93,8 +93,12 @@ return true; } +OCTAVE_NAMESPACE_END + #endif +OCTAVE_NAMESPACE_BEGIN + DEFUN_DLD (__voronoi__, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{C}, @var{F} =} __voronoi__ (@var{caller}, @var{pts})