Mercurial > octave
changeset 30595:00ab5e929111
lo-cutils: Remove wrapper for "qsort".
* liboctave/util/lo-cutils.c, liboctave/util/lo-cutils.c: Remove files with
wrapper for "qsort" that isn't used in Octave's codebase.
* liboctave/util/module.mk: Remove files from build system.
* liboctave/util/lo-util.h: Don't include "lo-cutils.h".
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Wed, 05 Jan 2022 19:30:43 +0100 |
| parents | 0cb3f48da9da |
| children | 2ace5c035cd2 |
| files | liboctave/util/lo-cutils.c liboctave/util/lo-cutils.h liboctave/util/lo-utils.h liboctave/util/module.mk |
| diffstat | 4 files changed, 0 insertions(+), 89 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/util/lo-cutils.c Wed Jan 05 13:28:52 2022 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -//////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 2000-2022 The Octave Project Developers -// -// See the file COPYRIGHT.md in the top-level directory of this -// distribution or <https://octave.org/copyright/>. -// -// This file is part of Octave. -// -// Octave is free software: you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Octave is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Octave; see the file COPYING. If not, see -// <https://www.gnu.org/licenses/>. -// -//////////////////////////////////////////////////////////////////////// - -#if defined (HAVE_CONFIG_H) -# include "config.h" -#endif - -#include <stdlib.h> - -#include "lo-cutils.h" - -OCTAVE_API void -octave_qsort (void *base, size_t n, size_t size, - int (*cmp) (const void *, const void *)) -{ - qsort (base, n, size, cmp); -}
--- a/liboctave/util/lo-cutils.h Wed Jan 05 13:28:52 2022 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -//////////////////////////////////////////////////////////////////////// -// -// Copyright (C) 2012-2022 The Octave Project Developers -// -// See the file COPYRIGHT.md in the top-level directory of this -// distribution or <https://octave.org/copyright/>. -// -// This file is part of Octave. -// -// Octave is free software: you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Octave is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Octave; see the file COPYING. If not, see -// <https://www.gnu.org/licenses/>. -// -//////////////////////////////////////////////////////////////////////// - -#if ! defined (octave_lo_cutils_h) -#define octave_lo_cutils_h 1 - -#include "octave-config.h" - -#if defined (__cplusplus) -#include <cstddef> -using std::size_t; -extern "C" { -#else -#include <stddef.h> -#endif - -OCTAVE_API void -octave_qsort (void *base, size_t n, size_t size, - int (*cmp) (const void *, const void *)); - -#if defined (__cplusplus) -} -#endif - -#endif
--- a/liboctave/util/lo-utils.h Wed Jan 05 13:28:52 2022 -0500 +++ b/liboctave/util/lo-utils.h Wed Jan 05 19:30:43 2022 +0100 @@ -33,7 +33,6 @@ #include <iosfwd> #include <string> -#include "lo-cutils.h" #include "oct-cmplx.h" #include "quit.h"
--- a/liboctave/util/module.mk Wed Jan 05 13:28:52 2022 -0500 +++ b/liboctave/util/module.mk Wed Jan 05 19:30:43 2022 +0100 @@ -9,7 +9,6 @@ %reldir%/file-info.h \ %reldir%/glob-match.h \ %reldir%/lo-array-errwarn.h \ - %reldir%/lo-cutils.h \ %reldir%/lo-hash.h \ %reldir%/lo-ieee.h \ %reldir%/lo-regexp.h \ @@ -53,7 +52,6 @@ UTIL_C_SRC = \ %reldir%/blaswrap.c \ %reldir%/f77-fcn.c \ - %reldir%/lo-cutils.c \ %reldir%/lo-error.c \ %reldir%/oct-rl-edit.c \ %reldir%/oct-rl-hist.c