Mercurial > octave
view src/main-cli.cc @ 31460:0f968958d7d5
eliminate Range class functions that are no longer needed
The Range class was deprecated in Octave 7 and should now be removed
from any public interfaces but we need it (or some replacement) to
allow legacy range objects to be loaded from files created by old
versions of Octave. This change is a start at doing this job. In a
future change, we might move the Range class from Range.h to
ov-legacy-range.cc, which is the only place where it is used, and
eliminate the Range data member from the octave_legacy_range class.
* ov.h, ov.cc (octave_value::make_range_rep_deprecated):
Delete unnecessary functions.
* ov.cc: Don't include Range.h.
* xpow.h: Delete forward declaration of Range.
* Range.h, Range.cc (Range::nnz, Range::checkelem, Range::elem,
Range::index, Range::sort_internal, Range::diag, Range::sort,
Range::issorted, Range::set_base, Range::set_limit, Range::set_inc,
Range::inc, Range::final_value, Range::dims, Range::rows, Range::cols,
Range::columns, Range::isempty, Range::operator ()): Delete.
(operator << (std::ostream&, const Range&),
operator >> (std::istream&, Range&)): Delete.
(operator - (const Range&), operator + (double, const Range&),
operator + (const Range&, double), operator - (double, const Range&)
operator - (const Range&, double), operator * (double, const Range&)
operator * (const Range&, double)): Delete functions and friend decls.
* doc/liboctave/range.texi: Delete docs for Range class.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 16 Nov 2022 14:05:18 -0500 |
parents | 796f54d4ddbf |
children | ea0b06534a37 |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // 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 (HAVE_CONFIG_H) # include "config.h" #endif #include <cstdlib> #include <iostream> #include <string> #if defined (OCTAVE_USE_WINDOWS_API) && defined (_UNICODE) # include <vector> # include <locale> # include <codecvt> #endif #include "liboctave-build-info.h" #include "liboctinterp-build-info.h" #include "oct-env.h" #include "signal-wrappers.h" #include "octave.h" #include "octave-build-info.h" #include "sysdep.h" static void check_hg_versions (void) { bool ok = true; // Each library and executable has its own definition of the hg // id. They should always match but may be different because of a // botched installation or incorrect LD_LIBRARY_PATH or some other // unusual problem. std::string octave_id = octave_hg_id (); std::string liboctave_id = liboctave_hg_id (); std::string liboctinterp_id = liboctinterp_hg_id (); if (octave_id != liboctave_id) { std::cerr << "octave hg id (" << octave_id << ") does not match liboctave hg id (" << liboctave_id << ')' << std::endl; ok = false; } if (octave_id != liboctinterp_id) { std::cerr << "octave hg id (" << octave_id << ") does not match liboctinterp hg id (" << liboctinterp_id << ')' << std::endl; ok = false; } if (! ok) exit (1); } #if defined (OCTAVE_USE_WINDOWS_API) && defined (_UNICODE) extern "C" int wmain (int argc, wchar_t **wargv) { static char **argv = new char * [argc + 1]; std::vector<std::string> argv_str; // convert wide character strings to multibyte UTF-8 strings std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> wchar_conv; for (int i_arg = 0; i_arg < argc; i_arg++) argv_str.push_back (wchar_conv.to_bytes (wargv[i_arg])); // Get pointers to C strings not before vector is stable. for (int i_arg = 0; i_arg < argc; i_arg++) argv[i_arg] = &argv_str[i_arg][0]; argv[argc] = nullptr; #else int main (int argc, char **argv) { #endif check_hg_versions (); octave_block_async_signals (); octave::sys::env::set_program_name (argv[0]); octave::cli_application app (argc, argv); return app.execute (); }