octave: libinterp/template-inst/Array-tc.cc annotate

annotate libinterp/template-inst/Array-tc.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

rev	line source
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	1 /*
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	2
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	3 Copyright (C) 1996-2015 John W. Eaton
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	4
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	6
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	8 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6708 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6708 diff changeset	10 option) any later version.
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	11
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	15 for more details.
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	16
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6708 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6708 diff changeset	19 <http://www.gnu.org/licenses/>.
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	20
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	21 */
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	22
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	23 // Instantiate Arrays of octave_values.
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	24
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	25 #ifdef HAVE_CONFIG_H
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	26 #include <config.h>
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	27 #endif
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	28
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	29 #include "Array.h"
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	30 #include "Array.cc"
295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	31
9208 cb163402bf79 narrow include in Array-tc.cc Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	32 #include "ov.h"
21573 f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	33 #include "ov-classdef.h"
2928 295f037b4b3e [project @ 1997-05-05 05:32:33 by jwe] jwe parents: diff changeset	34
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7209 diff changeset	35 #include "oct-sort.cc"
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7209 diff changeset	36
21573 f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	37 // Prevent implicit instantiations on some systems (Windows, others?)
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	38 // that can lead to duplicate definitions of static data members.
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7209 diff changeset	39
21573 f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	40 extern template class OCTAVE_API Array<Complex>;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	41 extern template class OCTAVE_API Array<FloatComplex>;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	42 extern template class OCTAVE_API Array<bool>;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	43 extern template class OCTAVE_API Array<char>;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	44 extern template class OCTAVE_API Array<double>;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	45 extern template class OCTAVE_API Array<float>;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	46 extern template class OCTAVE_API Array<idx_vector>;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	47 extern template class OCTAVE_API Array<octave_idx_type>;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	48 extern template class OCTAVE_API Array<std::string>;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	49
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	50 NO_INSTANTIATE_ARRAY_SORT (octave_value);
8721 e9cb742df9eb imported patch sort3.diff Jaroslav Hajek <highegg@gmail.com> parents: 8700 diff changeset	51 INSTANTIATE_ARRAY (octave_value, OCTINTERP_API);
21573 f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	52
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	53 NO_INSTANTIATE_ARRAY_SORT (cdef_object);
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	54 INSTANTIATE_ARRAY (cdef_object, OCTINTERP_API);

Mercurial > octave

annotate libinterp/template-inst/Array-tc.cc @ 21573:f3f8e1d3e399 stable