Mercurial > octave
view liboctave/array/Array-f.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
/* Copyright (C) 1994-2015 John W. Eaton Copyright (C) 2009 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 // Instantiate Arrays of float values. #include "lo-mappers.h" #include "Array.h" #include "Array.cc" #include "oct-locbuf.h" #define INLINE_ASCENDING_SORT #define INLINE_DESCENDING_SORT #include "oct-sort.cc" // Prevent implicit instantiations on some systems (Windows, others?) // that can lead to duplicate definitions of static data members. extern template class OCTAVE_API Array<idx_vector>; extern template class OCTAVE_API Array<octave_idx_type>; template <> inline bool sort_isnan<float> (float x) { return xisnan (x); } static bool nan_ascending_compare (float x, float y) { return xisnan (y) ? ! xisnan (x) : x < y; } static bool nan_descending_compare (float x, float y) { return xisnan (x) ? ! xisnan (y) : x > y; } Array<float>::compare_fcn_type safe_comparator (sortmode mode, const Array<float>& a , bool allow_chk) { Array<float>::compare_fcn_type result = 0; if (allow_chk) { octave_idx_type k = 0; for (; k < a.numel () && ! xisnan (a(k)); k++) ; if (k == a.numel ()) { if (mode == ASCENDING) result = octave_sort<float>::ascending_compare; else if (mode == DESCENDING) result = octave_sort<float>::descending_compare; } } if (! result) { if (mode == ASCENDING) result = nan_ascending_compare; else if (mode == DESCENDING) result = nan_descending_compare; } return result; } // The default solution using NaN-safe comparator is OK, but almost twice as // slow than this code. template <> OCTAVE_API sortmode Array<float>::is_sorted (sortmode mode) const { octave_idx_type n = numel (); const float *el = data (); if (n <= 1) return mode ? mode : ASCENDING; if (! mode) { // Auto-detect mode. if (el[n-1] < el[0] || xisnan (el[0])) mode = DESCENDING; else mode = ASCENDING; } if (mode == DESCENDING) { octave_idx_type j = 0; float r; // Sort out NaNs. do r = el[j++]; while (xisnan (r) && j < n); // Orient the test so that NaN will not pass through. for (; j < n; j++) { if (r >= el[j]) r = el[j]; else { mode = UNSORTED; break; } } } else if (mode == ASCENDING) { // Sort out NaNs. while (n > 0 && xisnan (el[n-1])) n--; if (n > 0) { // Orient the test so that NaN will not pass through. float r = el[0]; for (octave_idx_type j = 1; j < n; j++) { if (r <= el[j]) r = el[j]; else { mode = UNSORTED; break; } } } } return mode; } template class OCTAVE_API octave_sort<float>; INSTANTIATE_ARRAY (float, OCTAVE_API); template OCTAVE_API std::ostream& operator << (std::ostream&, const Array<float>&); #include "DiagArray2.h" #include "DiagArray2.cc" template class OCTAVE_API DiagArray2<float>;