Mercurial > octave
changeset 32514:b962f1d4ad1b
maint: Merge stable to default.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sat, 25 Nov 2023 17:35:36 +0100 |
| parents | 14f76908db23 (current diff) 1de97b475564 (diff) |
| children | f511a54000f7 |
| files | libinterp/octave-value/ov-base.cc |
| diffstat | 27 files changed, 105 insertions(+), 105 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/__pchip_deriv__.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/libinterp/corefcn/__pchip_deriv__.cc Sat Nov 25 17:35:36 2023 +0100 @@ -81,8 +81,8 @@ for (volatile octave_idx_type i = (rows ? nyr : nyc); i > 0; i--) { F77_XFCN (pchim, PCHIM, (nx, xvec.data (), - reinterpret_cast<float const *>(ymat.data ()) + k * inc, - reinterpret_cast<float *>(dmat.fortran_vec ()) + k * inc, + reinterpret_cast<float const *> (ymat.data ()) + k * inc, + reinterpret_cast<float *> (dmat.fortran_vec ()) + k * inc, incfd, ierr)); if (ierr < 0) @@ -90,8 +90,8 @@ OCTAVE_F77_INT_TYPE_FORMAT, ierr); F77_XFCN (pchim, PCHIM, (nx, xvec.data (), - reinterpret_cast<float const *>(ymat.data ()) + 1 + k * inc, - reinterpret_cast<float *>(dmat.fortran_vec ()) + 1 + k * inc, + reinterpret_cast<float const *> (ymat.data ()) + 1 + k * inc, + reinterpret_cast<float *> (dmat.fortran_vec ()) + 1 + k * inc, incfd, ierr)); if (ierr < 0) @@ -164,8 +164,8 @@ for (volatile octave_idx_type i = (rows ? nyr : nyc); i > 0; i--) { F77_XFCN (dpchim, DPCHIM, (nx, xvec.data (), - reinterpret_cast<double const *>(ymat.data ()) + k * inc, - reinterpret_cast<double *>(dmat.fortran_vec ()) + k * inc, + reinterpret_cast<double const *> (ymat.data ()) + k * inc, + reinterpret_cast<double *> (dmat.fortran_vec ()) + k * inc, incfd, ierr)); if (ierr < 0) @@ -173,8 +173,8 @@ OCTAVE_F77_INT_TYPE_FORMAT, ierr); F77_XFCN (dpchim, DPCHIM, (nx, xvec.data (), - reinterpret_cast<double const *>(ymat.data ()) + 1 + k * inc, - reinterpret_cast<double *>(dmat.fortran_vec ()) + 1 + k * inc, + reinterpret_cast<double const *> (ymat.data ()) + 1 + k * inc, + reinterpret_cast<double *> (dmat.fortran_vec ()) + 1 + k * inc, incfd, ierr)); if (ierr < 0)
--- a/libinterp/corefcn/ccolamd.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/libinterp/corefcn/ccolamd.cc Sat Nov 25 17:35:36 2023 +0100 @@ -277,7 +277,7 @@ OCTAVE_LOCAL_BUFFER (suitesparse_integer, cmember, cslen); for (octave_idx_type i = 0; i < cslen; i++) // convert cmember from 1-based to 0-based - cmember[i] = static_cast<suitesparse_integer>(in_cmember(i) - 1); + cmember[i] = static_cast<suitesparse_integer> (in_cmember(i) - 1); if (cslen != n_col) error ("ccolamd: CMEMBER must be of length equal to #cols of A");
--- a/libinterp/corefcn/data.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/libinterp/corefcn/data.cc Sat Nov 25 17:35:36 2023 +0100 @@ -447,8 +447,8 @@ void map_2_xlog2 (const Array<T>& x, Array<T>& f, Array<ET>& e) { - f = Array<T>(x.dims ()); - e = Array<ET>(x.dims ()); + f = Array<T> (x.dims ()); + e = Array<ET> (x.dims ()); for (octave_idx_type i = 0; i < x.numel (); i++) { int exp;
--- a/libinterp/corefcn/gzfstream.h Sat Nov 25 16:51:49 2023 +0100 +++ b/libinterp/corefcn/gzfstream.h Sat Nov 25 17:35:36 2023 +0100 @@ -303,7 +303,7 @@ */ gzfilebuf * rdbuf () const - { return const_cast<gzfilebuf *>(&m_sb); } + { return const_cast<gzfilebuf *> (&m_sb); } /** * @brief Check if file is open. @@ -390,7 +390,7 @@ */ gzfilebuf * rdbuf () const - { return const_cast<gzfilebuf *>(&m_sb); } + { return const_cast<gzfilebuf *> (&m_sb); } /** * @brief Check if file is open. @@ -493,12 +493,12 @@ template <typename T1, typename T2> inline gzofstream& operator<<(gzofstream& s, const gzomanip2<T1, T2>& m) -{ return (*m.m_fcn)(s, m.m_val1, m.m_val2); } +{ return (*m.m_fcn) (s, m.m_val1, m.m_val2); } // Insert this onto stream to simplify setting of compression level inline gzomanip2<int, int> setcompression (int l, int s = Z_DEFAULT_STRATEGY) -{ return gzomanip2<int, int>(&setcompression, l, s); } +{ return gzomanip2<int, int> (&setcompression, l, s); } #endif
--- a/libinterp/corefcn/stack-frame.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/libinterp/corefcn/stack-frame.cc Sat Nov 25 17:35:36 2023 +0100 @@ -338,7 +338,7 @@ void resize (std::size_t arg) { - int diff = static_cast<int> (arg) - static_cast<int>(size ()); + int diff = static_cast<int> (arg) - static_cast<int> (size ()); if (diff > 0) internal_resize (internal_size () + diff); @@ -360,7 +360,7 @@ // Not ok to resize for scripts. Extra slots should be in the eval frame. CHECK_PANIC (!m_fcn->is_user_script ()); - int diff = static_cast<int> (arg) - static_cast<int>(internal_size ()); + int diff = static_cast<int> (arg) - static_cast<int> (internal_size ()); if (diff > 0) {
--- a/libinterp/corefcn/strfind.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/libinterp/corefcn/strfind.cc Sat Nov 25 17:35:36 2023 +0100 @@ -47,7 +47,7 @@ // This allows safe indexing with char. // In C++, char may be (and often is) signed! -#define ORD(ch) static_cast<unsigned char>(ch) +#define ORD(ch) static_cast<unsigned char> (ch) #define TABSIZE (std::numeric_limits<unsigned char>::max () + 1) // This is the quick search algorithm, as described at
--- a/libinterp/corefcn/urlwrite.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/libinterp/corefcn/urlwrite.cc Sat Nov 25 17:35:36 2023 +0100 @@ -304,7 +304,7 @@ if (keys(i) == "Timeout") { float timeout = object.get (keys(i)).float_value (); - options.Timeout = static_cast<long>(timeout * 1000); + options.Timeout = static_cast<long> (timeout * 1000); } if (keys(i) == "HeaderFields")
--- a/libinterp/corefcn/xpow.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/libinterp/corefcn/xpow.cc Sat Nov 25 17:35:36 2023 +0100 @@ -84,7 +84,7 @@ xisint (float x) { static const float out_of_range_top - = static_cast<float>(std::numeric_limits<int>::max ()) + 1.; + = static_cast<float> (std::numeric_limits<int>::max ()) + 1.; return (octave::math::x_nint (x) == x && x < out_of_range_top && x >= std::numeric_limits<int>::min ());
--- a/libinterp/dldfcn/__init_fltk__.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/libinterp/dldfcn/__init_fltk__.cc Sat Nov 25 17:35:36 2023 +0100 @@ -1139,7 +1139,7 @@ && m_ax_obj.get_properties ().get_tag () != "colorbar") { axes::properties& ap - = dynamic_cast<axes::properties&>(m_ax_obj.get_properties ()); + = dynamic_cast<axes::properties&> (m_ax_obj.get_properties ()); ap.set (name, value); } else // no axes object clicked so far, take currentaxes @@ -1152,7 +1152,7 @@ graphics_object go = gh_mgr.get_object (gh); axes::properties& ap - = dynamic_cast<axes::properties&>(go.get_properties ()); + = dynamic_cast<axes::properties&> (go.get_properties ()); ap.set (name, value); }
--- a/libinterp/octave-value/ov-base-scalar.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/libinterp/octave-value/ov-base-scalar.cc Sat Nov 25 17:35:36 2023 +0100 @@ -233,7 +233,7 @@ // Don't use builtin_type () here to avoid an extra VM call. if (btyp == class_to_btyp<ST>::btyp) { - *(reinterpret_cast<ST *>(where)) = scalar; + *(reinterpret_cast<ST *> (where)) = scalar; return true; } else
--- a/libinterp/octave-value/ov-base.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/libinterp/octave-value/ov-base.cc Sat Nov 25 17:35:36 2023 +0100 @@ -547,7 +547,7 @@ } \ \ static const double out_of_range_top \ - = static_cast<double>(std::numeric_limits<T>::max ()) + 1.; \ + = static_cast<double> (std::numeric_limits<T>::max ()) + 1.; \ if (require_int && octave::math::x_nint (d) != d) \ error_with_cfn ("conversion of %g to " #T " value failed", d); \ else if (d < std::numeric_limits<T>::min ()) \
--- a/libinterp/octave-value/ov-float.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/libinterp/octave-value/ov-float.cc Sat Nov 25 17:35:36 2023 +0100 @@ -442,12 +442,12 @@ // Support inline real->complex conversion. if (btyp == btyp_float) { - *(reinterpret_cast<float *>(where)) = scalar; + *(reinterpret_cast<float *> (where)) = scalar; return true; } else if (btyp == btyp_float_complex) { - *(reinterpret_cast<FloatComplex *>(where)) = scalar; + *(reinterpret_cast<FloatComplex *> (where)) = scalar; return true; } else
--- a/libinterp/octave-value/ov-scalar.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/libinterp/octave-value/ov-scalar.cc Sat Nov 25 17:35:36 2023 +0100 @@ -469,12 +469,12 @@ // Support inline real->complex conversion. if (btyp == btyp_double) { - *(reinterpret_cast<double *>(where)) = scalar; + *(reinterpret_cast<double *> (where)) = scalar; return true; } else if (btyp == btyp_complex) { - *(reinterpret_cast<Complex *>(where)) = scalar; + *(reinterpret_cast<Complex *> (where)) = scalar; return true; } else
--- a/libinterp/octave-value/ov-struct.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/libinterp/octave-value/ov-struct.cc Sat Nov 25 17:35:36 2023 +0100 @@ -1111,7 +1111,7 @@ // To avoid copying the scalar struct, it just stores a pointer to // itself. const octave_scalar_map *sm_ptr; - void *here = reinterpret_cast<void *>(&sm_ptr); + void *here = reinterpret_cast<void *> (&sm_ptr); return (x.get_rep ().fast_elem_insert_self (here, btyp_struct) && m_map.fast_elem_insert (n, *sm_ptr)); } @@ -1779,7 +1779,7 @@ if (btyp == btyp_struct) { - *(reinterpret_cast<const octave_scalar_map **>(where)) = &m_map; + *(reinterpret_cast<const octave_scalar_map **> (where)) = &m_map; return true; } else
--- a/libinterp/parse-tree/pt-bytecode-vm-internal.h Sat Nov 25 16:51:49 2023 +0100 +++ b/libinterp/parse-tree/pt-bytecode-vm-internal.h Sat Nov 25 17:35:36 2023 +0100 @@ -261,7 +261,7 @@ #define CATCH_INTERRUPT_EXCEPTION \ catch (interrupt_exception& e) \ { \ - (*sp++).i = static_cast<int>(error_type::INTERRUPT_EXC); \ + (*sp++).i = static_cast<int> (error_type::INTERRUPT_EXC); \ goto unwind; \ } \
--- a/libinterp/parse-tree/pt-bytecode-vm.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/libinterp/parse-tree/pt-bytecode-vm.cc Sat Nov 25 17:35:36 2023 +0100 @@ -1137,8 +1137,8 @@ // Read the meta data for constructing a stack frame. { -#define N_RETURNS() static_cast<signed char>(code[0]) -#define N_ARGS() static_cast<signed char>(code[1]) +#define N_RETURNS() static_cast<signed char> (code[0]) +#define N_ARGS() static_cast<signed char> (code[1]) #define N_LOCALS() USHORT_FROM_UCHAR_PTR (code + 2) int n_returns = static_cast<signed char> (*ip++); @@ -1340,7 +1340,7 @@ if (vararg_defined && !ov_vararg.iscell ()) { (*sp++).pee = new execution_exception {"error","","varargout must be a cell array object"}; - (*sp++).i = static_cast<int>(error_type::EXECUTION_EXC); + (*sp++).i = static_cast<int> (error_type::EXECUTION_EXC); goto unwind; } if (vararg_defined) @@ -1560,7 +1560,7 @@ if (lst.empty ()) { // TODO: Need id, name - (*sp++).i = static_cast<int>(error_type::INVALID_N_EL_RHS_IN_ASSIGNMENT); + (*sp++).i = static_cast<int> (error_type::INVALID_N_EL_RHS_IN_ASSIGNMENT); goto unwind; } @@ -1570,7 +1570,7 @@ if (ov_rhs.is_undefined ()) { // TODO: Need id, name - (*sp++).i = static_cast<int>(error_type::RHS_UNDEF_IN_ASSIGNMENT); + (*sp++).i = static_cast<int> (error_type::RHS_UNDEF_IN_ASSIGNMENT); goto unwind; } @@ -1652,7 +1652,7 @@ } else { - (*sp++).i = static_cast<int>(error_type::IF_UNDEFINED); + (*sp++).i = static_cast<int> (error_type::IF_UNDEFINED); goto unwind; } @@ -2015,7 +2015,7 @@ if (! ov.is_defined ()) { (*sp++).ps = new std::string {name_data[slot]}; - (*sp++).i = static_cast<int>(error_type::ID_UNDEFINED); + (*sp++).i = static_cast<int> (error_type::ID_UNDEFINED); goto unwind; } @@ -2528,7 +2528,7 @@ if (! fcn) { (*sp++).ps = new std::string {name_data[slot]}; - (*sp++).i = static_cast<int>(error_type::ID_UNDEFINED); + (*sp++).i = static_cast<int> (error_type::ID_UNDEFINED); goto unwind; } else if (fcn->is_compiled ()) @@ -3593,7 +3593,7 @@ { // TODO: Need id, name // TODO: Make execution_exception like the others instead of its own error_type - (*sp++).i = static_cast<int>(error_type::INVALID_N_EL_RHS_IN_ASSIGNMENT); + (*sp++).i = static_cast<int> (error_type::INVALID_N_EL_RHS_IN_ASSIGNMENT); goto unwind; } @@ -3639,7 +3639,7 @@ if (ov.is_undefined ()) { (*sp++).pee = new execution_exception {"error","","invalid use of 'end': may only be used to index existing value"}; - (*sp++).i = static_cast<int>(error_type::EXECUTION_EXC); + (*sp++).i = static_cast<int> (error_type::EXECUTION_EXC); goto unwind; } @@ -3681,7 +3681,7 @@ if (ov.is_undefined ()) { (*sp++).pee = new execution_exception {"error","","invalid use of 'end': may only be used to index existing value"}; - (*sp++).i = static_cast<int>(error_type::EXECUTION_EXC); + (*sp++).i = static_cast<int> (error_type::EXECUTION_EXC); goto unwind; } @@ -3749,7 +3749,7 @@ if (is_undef && i + 1 == n_ids) { (*sp++).pee = new execution_exception {"error","","invalid use of 'end': may only be used to index existing value"}; - (*sp++).i = static_cast<int>(error_type::EXECUTION_EXC); + (*sp++).i = static_cast<int> (error_type::EXECUTION_EXC); goto unwind; } else if (is_undef) @@ -4185,7 +4185,7 @@ if (! fcn) { (*sp++).ps = new std::string {name_data[slot]}; - (*sp++).i = static_cast<int>(error_type::ID_UNDEFINED); + (*sp++).i = static_cast<int> (error_type::ID_UNDEFINED); goto unwind; } @@ -4613,7 +4613,7 @@ if (! fcn) { (*sp++).ps = new std::string {name_data[slot]}; - (*sp++).i = static_cast<int>(error_type::ID_UNDEFINED); + (*sp++).i = static_cast<int> (error_type::ID_UNDEFINED); goto unwind; } @@ -5070,7 +5070,7 @@ { (*sp++).pee = new execution_exception {"error", "", "can't make persistent variable '" + name + "' global"}; - (*sp++).i = static_cast<int>(error_type::EXECUTION_EXC); + (*sp++).i = static_cast<int> (error_type::EXECUTION_EXC); goto unwind; } @@ -5103,7 +5103,7 @@ { (*sp++).pee = new execution_exception {"error", "", "can't make global variable '" + name + "' persistent"}; - (*sp++).i = static_cast<int>(error_type::EXECUTION_EXC); + (*sp++).i = static_cast<int> (error_type::EXECUTION_EXC); goto unwind; } @@ -5172,7 +5172,7 @@ { (*sp++).pee = new execution_exception {"error", "", "in computed assignment A OP= X, A must be defined first"}; - (*sp++).i = static_cast<int>(error_type::EXECUTION_EXC); + (*sp++).i = static_cast<int> (error_type::EXECUTION_EXC); goto unwind; } @@ -5348,7 +5348,7 @@ // Are we unwinding an interrupt exception? if (m_unwinding_interrupt) { - (*sp++).i = static_cast<int>(error_type::INTERRUPT_EXC); + (*sp++).i = static_cast<int> (error_type::INTERRUPT_EXC); goto unwind; } @@ -5435,7 +5435,7 @@ if (! fcn) { (*sp++).ps = new std::string {name_data[slot]}; - (*sp++).i = static_cast<int>(error_type::ID_UNDEFINED); + (*sp++).i = static_cast<int> (error_type::ID_UNDEFINED); goto unwind; } @@ -5780,7 +5780,7 @@ if (!has_slot) { (*sp++).ps = new std::string {"temporary object"}; - (*sp++).i = static_cast<int>(error_type::ID_UNDEFINED); + (*sp++).i = static_cast<int> (error_type::ID_UNDEFINED); goto unwind; } @@ -5819,7 +5819,7 @@ (*sp++).ps = new std::string {name_data[slot]}; else (*sp++).ps = new std::string {"temporary object"}; - (*sp++).i = static_cast<int>(error_type::ID_UNDEFINED); + (*sp++).i = static_cast<int> (error_type::ID_UNDEFINED); goto unwind; }
--- a/liboctave/array/CSparse.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/liboctave/array/CSparse.cc Sat Nov 25 17:35:36 2023 +0100 @@ -5795,7 +5795,7 @@ { octave_idx_type jr = j * b.rows (); for (octave_idx_type i = 0; i < b.rows (); i++) - retval.xelem (i, j) = static_cast<Complex *>(X->x)[jr + i]; + retval.xelem (i, j) = static_cast<Complex *> (X->x)[jr + i]; } CHOLMOD_NAME(free_dense) (&X, cm); @@ -6046,13 +6046,13 @@ (X, cm))); for (octave_idx_type j = 0; j <= static_cast<octave_idx_type> (X->ncol); j++) - retval.xcidx (j) = static_cast<octave_idx_type *>(X->p)[j]; + retval.xcidx (j) = static_cast<octave_idx_type *> (X->p)[j]; for (octave_idx_type j = 0; j < octave::from_suitesparse_long (CHOLMOD_NAME(nnz) (X, cm)); j++) { - retval.xridx (j) = static_cast<octave_idx_type *>(X->i)[j]; - retval.xdata (j) = static_cast<Complex *>(X->x)[j]; + retval.xridx (j) = static_cast<octave_idx_type *> (X->i)[j]; + retval.xdata (j) = static_cast<Complex *> (X->x)[j]; } CHOLMOD_NAME(free_sparse) (&X, cm); @@ -6326,7 +6326,7 @@ { octave_idx_type jr = j * b.rows (); for (octave_idx_type i = 0; i < b.rows (); i++) - retval.xelem (i, j) = static_cast<Complex *>(X->x)[jr + i]; + retval.xelem (i, j) = static_cast<Complex *> (X->x)[jr + i]; } CHOLMOD_NAME(free_dense) (&X, cm); @@ -6556,13 +6556,13 @@ (X, cm))); for (octave_idx_type j = 0; j <= static_cast<octave_idx_type> (X->ncol); j++) - retval.xcidx (j) = static_cast<octave_idx_type *>(X->p)[j]; + retval.xcidx (j) = static_cast<octave_idx_type *> (X->p)[j]; for (octave_idx_type j = 0; j < octave::from_suitesparse_long (CHOLMOD_NAME(nnz) (X, cm)); j++) { - retval.xridx (j) = static_cast<octave_idx_type *>(X->i)[j]; - retval.xdata (j) = static_cast<Complex *>(X->x)[j]; + retval.xridx (j) = static_cast<octave_idx_type *> (X->i)[j]; + retval.xdata (j) = static_cast<Complex *> (X->x)[j]; } CHOLMOD_NAME(free_sparse) (&X, cm);
--- a/liboctave/array/MSparse.h Sat Nov 25 16:51:49 2023 +0100 +++ b/liboctave/array/MSparse.h Sat Nov 25 17:35:36 2023 +0100 @@ -70,7 +70,7 @@ explicit MSparse (octave_idx_type r, octave_idx_type c, T val) : Sparse<T> (r, c, val) { } - explicit MSparse (const PermMatrix& a) : Sparse<T>(a) { } + explicit MSparse (const PermMatrix& a) : Sparse<T> (a) { } MSparse (octave_idx_type r, octave_idx_type c, octave_idx_type num_nz) : Sparse<T> (r, c, num_nz) { }
--- a/liboctave/array/Sparse.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/liboctave/array/Sparse.cc Sat Nov 25 17:35:36 2023 +0100 @@ -263,10 +263,10 @@ { // Work in unsigned long long to avoid overflow issues with numel - unsigned long long a_nel = static_cast<unsigned long long>(a.rows ()) * - static_cast<unsigned long long>(a.cols ()); - unsigned long long dv_nel = static_cast<unsigned long long>(dv(0)) * - static_cast<unsigned long long>(dv(1)); + unsigned long long a_nel = static_cast<unsigned long long> (a.rows ()) * + static_cast<unsigned long long> (a.cols ()); + unsigned long long dv_nel = static_cast<unsigned long long> (dv(0)) * + static_cast<unsigned long long> (dv(1)); if (a_nel != dv_nel) (*current_liboctave_error_handler)
--- a/liboctave/array/dSparse.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/liboctave/array/dSparse.cc Sat Nov 25 17:35:36 2023 +0100 @@ -5837,7 +5837,7 @@ { octave_idx_type jr = j * b.rows (); for (octave_idx_type i = 0; i < b.rows (); i++) - retval.xelem (i, j) = static_cast<double *>(X->x)[jr + i]; + retval.xelem (i, j) = static_cast<double *> (X->x)[jr + i]; } CHOLMOD_NAME(free_dense) (&X, cm); @@ -6060,13 +6060,13 @@ (X, cm))); for (octave_idx_type j = 0; j <= static_cast<octave_idx_type> (X->ncol); j++) - retval.xcidx (j) = static_cast<octave_idx_type *>(X->p)[j]; + retval.xcidx (j) = static_cast<octave_idx_type *> (X->p)[j]; for (octave_idx_type j = 0; j < octave::from_suitesparse_long (CHOLMOD_NAME(nnz) (X, cm)); j++) { - retval.xridx (j) = static_cast<octave_idx_type *>(X->i)[j]; - retval.xdata (j) = static_cast<double *>(X->x)[j]; + retval.xridx (j) = static_cast<octave_idx_type *> (X->i)[j]; + retval.xdata (j) = static_cast<double *> (X->x)[j]; } CHOLMOD_NAME(free_sparse) (&X, cm); @@ -6311,7 +6311,7 @@ { octave_idx_type jr = j * b.rows (); for (octave_idx_type i = 0; i < b.rows (); i++) - retval.xelem (i, j) = static_cast<Complex *>(X->x)[jr + i]; + retval.xelem (i, j) = static_cast<Complex *> (X->x)[jr + i]; } CHOLMOD_NAME(free_dense) (&X, cm); @@ -6555,13 +6555,13 @@ (X, cm))); for (octave_idx_type j = 0; j <= static_cast<octave_idx_type> (X->ncol); j++) - retval.xcidx (j) = static_cast<octave_idx_type *>(X->p)[j]; + retval.xcidx (j) = static_cast<octave_idx_type *> (X->p)[j]; for (octave_idx_type j = 0; j < octave::from_suitesparse_long (CHOLMOD_NAME(nnz) (X, cm)); j++) { - retval.xridx (j) = static_cast<octave_idx_type *>(X->i)[j]; - retval.xdata (j) = static_cast<Complex *>(X->x)[j]; + retval.xridx (j) = static_cast<octave_idx_type *> (X->i)[j]; + retval.xdata (j) = static_cast<Complex *> (X->x)[j]; } CHOLMOD_NAME(free_sparse) (&X, cm);
--- a/liboctave/array/dSparse.h Sat Nov 25 16:51:49 2023 +0100 +++ b/liboctave/array/dSparse.h Sat Nov 25 17:35:36 2023 +0100 @@ -84,7 +84,7 @@ explicit OCTAVE_API SparseMatrix (const DiagMatrix& a); - explicit SparseMatrix (const PermMatrix& a) : MSparse<double>(a) { } + explicit SparseMatrix (const PermMatrix& a) : MSparse<double> (a) { } SparseMatrix (octave_idx_type r, octave_idx_type c, octave_idx_type num_nz) : MSparse<double> (r, c, num_nz) { }
--- a/liboctave/numeric/lo-mappers.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/liboctave/numeric/lo-mappers.cc Sat Nov 25 17:35:36 2023 +0100 @@ -184,7 +184,7 @@ nint_big (double x) { static const double out_of_range_top - = static_cast<double>(std::numeric_limits<octave_idx_type>::max ())+1.; + = static_cast<double> (std::numeric_limits<octave_idx_type>::max ())+1.; if (x >= out_of_range_top) return std::numeric_limits<octave_idx_type>::max (); else if (x < std::numeric_limits<octave_idx_type>::min ()) @@ -198,7 +198,7 @@ nint_big (float x) { static const float out_of_range_top - = static_cast<float>(std::numeric_limits<octave_idx_type>::max ())+1.; + = static_cast<float> (std::numeric_limits<octave_idx_type>::max ())+1.; if (x >= out_of_range_top) return std::numeric_limits<octave_idx_type>::max (); else if (x < std::numeric_limits<octave_idx_type>::min ()) @@ -223,7 +223,7 @@ nint (float x) { static const float out_of_range_top - = static_cast<float>(std::numeric_limits<int>::max ()) + 1.; + = static_cast<float> (std::numeric_limits<int>::max ()) + 1.; if (x >= out_of_range_top) return std::numeric_limits<int>::max (); else if (x < std::numeric_limits<int>::min ())
--- a/liboctave/numeric/oct-fftw.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/liboctave/numeric/oct-fftw.cc Sat Nov 25 17:35:36 2023 +0100 @@ -867,7 +867,7 @@ stride, dist, in, out); fftw_plan m_plan = reinterpret_cast<fftw_plan> (vplan); - fftw_execute_dft_r2c (m_plan, (const_cast<double *>(in)), + fftw_execute_dft_r2c (m_plan, (const_cast<double *> (in)), reinterpret_cast<fftw_complex *> (out)); // Need to create other half of the transform. @@ -891,7 +891,7 @@ fftw_plan m_plan = reinterpret_cast<fftw_plan> (vplan); fftw_execute_dft (m_plan, - reinterpret_cast<fftw_complex *> (const_cast<Complex *>(in)), + reinterpret_cast<fftw_complex *> (const_cast<Complex *> (in)), reinterpret_cast<fftw_complex *> (out)); return 0; @@ -910,7 +910,7 @@ fftw_plan m_plan = reinterpret_cast<fftw_plan> (vplan); fftw_execute_dft (m_plan, - reinterpret_cast<fftw_complex *> (const_cast<Complex *>(in)), + reinterpret_cast<fftw_complex *> (const_cast<Complex *> (in)), reinterpret_cast<fftw_complex *> (out)); const Complex scale = npts; @@ -938,7 +938,7 @@ in, out + offset); fftw_plan m_plan = reinterpret_cast<fftw_plan> (vplan); - fftw_execute_dft_r2c (m_plan, (const_cast<double *>(in)), + fftw_execute_dft_r2c (m_plan, (const_cast<double *> (in)), reinterpret_cast<fftw_complex *> (out+ offset)); // Need to create other half of the transform. @@ -961,7 +961,7 @@ fftw_plan m_plan = reinterpret_cast<fftw_plan> (vplan); fftw_execute_dft (m_plan, - reinterpret_cast<fftw_complex *> (const_cast<Complex *>(in)), + reinterpret_cast<fftw_complex *> (const_cast<Complex *> (in)), reinterpret_cast<fftw_complex *> (out)); return 0; @@ -980,7 +980,7 @@ fftw_plan m_plan = reinterpret_cast<fftw_plan> (vplan); fftw_execute_dft (m_plan, - reinterpret_cast<fftw_complex *> (const_cast<Complex *>(in)), + reinterpret_cast<fftw_complex *> (const_cast<Complex *> (in)), reinterpret_cast<fftw_complex *> (out)); const std::size_t npts = dv.numel (); @@ -1003,7 +1003,7 @@ dist, in, out); fftwf_plan m_plan = reinterpret_cast<fftwf_plan> (vplan); - fftwf_execute_dft_r2c (m_plan, (const_cast<float *>(in)), + fftwf_execute_dft_r2c (m_plan, (const_cast<float *> (in)), reinterpret_cast<fftwf_complex *> (out)); // Need to create other half of the transform. @@ -1027,7 +1027,7 @@ fftwf_plan m_plan = reinterpret_cast<fftwf_plan> (vplan); fftwf_execute_dft (m_plan, - reinterpret_cast<fftwf_complex *> (const_cast<FloatComplex *>(in)), + reinterpret_cast<fftwf_complex *> (const_cast<FloatComplex *> (in)), reinterpret_cast<fftwf_complex *> (out)); return 0; @@ -1047,7 +1047,7 @@ fftwf_plan m_plan = reinterpret_cast<fftwf_plan> (vplan); fftwf_execute_dft (m_plan, - reinterpret_cast<fftwf_complex *> (const_cast<FloatComplex *>(in)), + reinterpret_cast<fftwf_complex *> (const_cast<FloatComplex *> (in)), reinterpret_cast<fftwf_complex *> (out)); const FloatComplex scale = npts; @@ -1075,7 +1075,7 @@ in, out + offset); fftwf_plan m_plan = reinterpret_cast<fftwf_plan> (vplan); - fftwf_execute_dft_r2c (m_plan, (const_cast<float *>(in)), + fftwf_execute_dft_r2c (m_plan, (const_cast<float *> (in)), reinterpret_cast<fftwf_complex *> (out+ offset)); // Need to create other half of the transform. @@ -1098,7 +1098,7 @@ fftwf_plan m_plan = reinterpret_cast<fftwf_plan> (vplan); fftwf_execute_dft (m_plan, - reinterpret_cast<fftwf_complex *> (const_cast<FloatComplex *>(in)), + reinterpret_cast<fftwf_complex *> (const_cast<FloatComplex *> (in)), reinterpret_cast<fftwf_complex *> (out)); return 0; @@ -1117,7 +1117,7 @@ fftwf_plan m_plan = reinterpret_cast<fftwf_plan> (vplan); fftwf_execute_dft (m_plan, - reinterpret_cast<fftwf_complex *> (const_cast<FloatComplex *>(in)), + reinterpret_cast<fftwf_complex *> (const_cast<FloatComplex *> (in)), reinterpret_cast<fftwf_complex *> (out)); const std::size_t npts = dv.numel ();
--- a/liboctave/numeric/sparse-chol.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/liboctave/numeric/sparse-chol.cc Sat Nov 25 17:35:36 2023 +0100 @@ -152,9 +152,9 @@ if (! S) return; - octave_idx_type *Sp = static_cast<octave_idx_type *>(S->p); - octave_idx_type *Si = static_cast<octave_idx_type *>(S->i); - chol_elt *Sx = static_cast<chol_elt *>(S->x); + octave_idx_type *Sp = static_cast<octave_idx_type *> (S->p); + octave_idx_type *Si = static_cast<octave_idx_type *> (S->i); + chol_elt *Sx = static_cast<chol_elt *> (S->x); octave_idx_type pdest = 0; octave_idx_type ncol = S->ncol; @@ -314,7 +314,7 @@ m_L->p, &n1, cm); CHOLMOD_NAME(reallocate_sparse) - (static_cast<octave_idx_type *>(m_L->p)[m_minor_p], + (static_cast<octave_idx_type *> (m_L->p)[m_minor_p], m_L, cm); m_L->ncol = m_minor_p; @@ -326,7 +326,7 @@ { m_perm.resize (a_nr); for (octave_idx_type i = 0; i < a_nr; i++) - m_perm(i) = static_cast<octave_idx_type *>(Lfactor->Perm)[i]; + m_perm(i) = static_cast<octave_idx_type *> (Lfactor->Perm)[i]; } } @@ -429,12 +429,12 @@ chol_type ret (m->nrow, nc, nnz); for (octave_idx_type j = 0; j < nc+1; j++) - ret.xcidx (j) = static_cast<octave_idx_type *>(m->p)[j]; + ret.xcidx (j) = static_cast<octave_idx_type *> (m->p)[j]; for (octave_idx_type i = 0; i < nnz; i++) { - ret.xridx (i) = static_cast<octave_idx_type *>(m->i)[i]; - ret.xdata (i) = static_cast<chol_elt *>(m->x)[i]; + ret.xridx (i) = static_cast<octave_idx_type *> (m->i)[i]; + ret.xdata (i) = static_cast<chol_elt *> (m->x)[i]; } return ret;
--- a/liboctave/numeric/sparse-qr.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/liboctave/numeric/sparse-qr.cc Sat Nov 25 17:35:36 2023 +0100 @@ -1614,7 +1614,7 @@ for (octave_idx_type j = 0; j < nz; j++) { ret.xridx (j) = N->U->i[j]; - ret.xdata (j) = reinterpret_cast<Complex *>(N->U->x)[j]; + ret.xdata (j) = reinterpret_cast<Complex *> (N->U->x)[j]; } return ret; @@ -2079,7 +2079,7 @@ buf[j] = 0.0; CXSPARSE_ZNAME (_ipvec) (S->pinv, - reinterpret_cast<cs_complex_t *>(Xx), + reinterpret_cast<cs_complex_t *> (Xx), buf, nr); for (volatile octave_idx_type j = 0; j < nc; j++) @@ -2625,7 +2625,7 @@ for (octave_idx_type j = nr; j < nbuf; j++) buf[j] = 0.0; - CXSPARSE_ZNAME (_pvec) (S->q, reinterpret_cast<cs_complex_t *>(Xx), + CXSPARSE_ZNAME (_pvec) (S->q, reinterpret_cast<cs_complex_t *> (Xx), buf, nr); CXSPARSE_ZNAME (_utsolve) (N->U, buf); @@ -2637,7 +2637,7 @@ } CXSPARSE_ZNAME (_pvec) (S->pinv, buf, - reinterpret_cast<cs_complex_t *>(Xx), nc); + reinterpret_cast<cs_complex_t *> (Xx), nc); for (octave_idx_type j = 0; j < nc; j++) {
--- a/liboctave/util/oct-string.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/liboctave/util/oct-string.cc Sat Nov 25 17:35:36 2023 +0100 @@ -660,7 +660,7 @@ }, &count); - if (count == static_cast<size_t>(-1)) + if (count == static_cast<size_t> (-1)) { encoding_list.push_back ("UTF-8"); return encoding_list; @@ -917,9 +917,9 @@ len = 10; static const T out_of_range_top - = static_cast<T>(std::numeric_limits<int>::max ()) + 1.; + = static_cast<T> (std::numeric_limits<int>::max ()) + 1.; static const T out_of_range_bottom - = static_cast<T>(std::numeric_limits<int>::min ()) - 1.; + = static_cast<T> (std::numeric_limits<int>::min ()) - 1.; if (octave::math::isinf (val)) { if (val > 0)
--- a/liboctave/util/url-transfer.cc Sat Nov 25 16:51:49 2023 +0100 +++ b/liboctave/util/url-transfer.cc Sat Nov 25 17:35:36 2023 +0100 @@ -604,7 +604,7 @@ SETOPTR (CURLOPT_HEADERFUNCTION, write_data); std::ostringstream buf; - SETOPTR (CURLOPT_WRITEHEADER, static_cast<void *>(&buf)); + SETOPTR (CURLOPT_WRITEHEADER, static_cast<void *> (&buf)); perform (); if (! good ())