Mercurial > octave
view liboctave/array/DiagArray2.cc @ 21573:f3f8e1d3e399 stable
avoid mulitple definitions of static function-scope vars (bug #47372)
Some systems (Windows, others?) may generate multiple definitions of
function-scope static variables if those functions appear in header
files. This can cause trouble in various ways. Attempt to avoid the
problem by moving functions that contain file-scope varaibles from
header files to source files, or by using class-scope static variables
instead. Also attempt to avoid similar problems caused by implicit
instantiations of templates that have functions with static variables.
* Cell.h, Cell.cc (Cell::resize_fill_value):
Move definition from header to source file.
* oct-map.h, oct-map.cc (octave_fields::nil_rep): Likewise.
* ov-base-scalar.h, ov-base-scalar.cc (octave_base_scalar<ST>::dims):
Likewise.
* ov-fcn-handle.h, ov-fcn-handle.cc (octave_fcn_handle::dims): Likewise.
* ov.h, ov.cc (octave_value::nil_rep): Likewise.
* Array.h, Array.cc (Array<T>::nil_rep): Likewise.
* DiagArray2.h, DiagArray2.cc (DiagArray2<T>::elem,
DiagArray2<T>::checkelem): Likewise.
* Sparse.h, Sparse.cc (Sparse<T>::nil_rep): Likewise.
* dim-vector.h, dim-vector.cc (dim_vector::nil_rep): Likewise.
* idx-vector.h, idx-vector.cc (idx_vector::nil_rep,
idx_vector::err_rep): Likewise.
* oct-inttypes.h, oct-inttypes.cc (octave_int_base<T>::convert_real):
Likewise.
* symtab.h, symtab.cc (octave_value symbol_table::dummy_octave_value,
symbol_table::symbol_record symbol_table::dummy_symbol_record): New
class-scope static variables. Use them to eliminate function-scope
static variables.
* ov-int8.cc, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-uint8.cc,
ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-scalar.cc,
ov-flt-complex.cc, ov-complex.cc, ov-classdef.cc, ov-bool.cc,
Array-jit.cc, Array-os.cc, Array-tc.cc, Array-C.cc, Array-b.cc,
Array-ch.cc, Array-d.cc, Array-f.cc, Array-fC.cc, Array-i.cc,
Array-idx-vec.cc, Array-s.cc, Array-str.cc, Array-voidp.cc:
Prevent impliticit template instantiation.
* Array-tc.cc: Also instantiate Array<cdef_object>.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 01 Apr 2016 12:04:04 -0400 |
parents | 4197fc428c7d |
children | ae4d7dfea337 |
line wrap: on
line source
// Template array classes /* Copyright (C) 1996-2015 John W. Eaton Copyright (C) 2010 VZLU Prague 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 <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <cassert> #include <iostream> #include <algorithm> #include "DiagArray2.h" #include "lo-error.h" template <class T> DiagArray2<T>::DiagArray2 (const Array<T>& a, octave_idx_type r, octave_idx_type c) : Array<T> (a.as_column ()), d1 (r), d2 (c) { octave_idx_type rcmin = std::min (r, c); if (rcmin != a.length ()) Array<T>::resize (dim_vector (rcmin, 1)); } template <class T> Array<T> DiagArray2<T>::diag (octave_idx_type k) const { return extract_diag (k); } template <class T> Array<T> DiagArray2<T>::extract_diag (octave_idx_type k) const { Array<T> d; if (k == 0) // The main diagonal is shallow-copied. d = *this; else if (k > 0 && k < cols ()) d = Array<T> (dim_vector (std::min (cols () - k, rows ()), 1), T ()); else if (k < 0 && -k < rows ()) d = Array<T> (dim_vector (std::min (rows () + k, cols ()), 1), T ()); else // Matlab returns [] 0x1 for out-of-range diagonal d.resize (dim_vector (0, 1)); return d; } template <class T> DiagArray2<T> DiagArray2<T>::transpose (void) const { return DiagArray2<T> (*this, d2, d1); } template <class T> DiagArray2<T> DiagArray2<T>::hermitian (T (* fcn) (const T&)) const { return DiagArray2<T> (Array<T>::template map<T> (fcn), d2, d1); } // A two-dimensional array with diagonal elements only. template <class T> T& DiagArray2<T>::elem (octave_idx_type r, octave_idx_type c) { static T zero (0); return (r == c) ? Array<T>::elem (r) : zero; } template <class T> T& DiagArray2<T>::checkelem (octave_idx_type r, octave_idx_type c) { static T zero (0); return check_idx (r, c) ? elem (r, c) : zero; } template <class T> void DiagArray2<T>::resize (octave_idx_type r, octave_idx_type c, const T& rfv) { if (r < 0 || c < 0) { (*current_liboctave_error_handler) ("can't resize to negative dimensions"); return; } if (r != dim1 () || c != dim2 ()) { Array<T>::resize (dim_vector (std::min (r, c), 1), rfv); d1 = r; d2 = c; } } template <class T> Array<T> DiagArray2<T>::array_value (void) const { Array<T> result (dims (), T (0)); for (octave_idx_type i = 0, len = length (); i < len; i++) result.xelem (i, i) = dgelem (i); return result; } template <typename T> bool DiagArray2<T>::check_idx (octave_idx_type r, octave_idx_type c) const { bool ok = true; if (r < 0 || r >= dim1 ()) { gripe_index_out_of_range (2, 1, r+1, dim1 ()); ok = false; } if (c < 0 || c >= dim2 ()) { gripe_index_out_of_range (2, 2, c+1, dim2 ()); ok = false; } return ok; }