Mercurial > octave
view liboctave/array/Array-i.cc @ 31396:7e60506a5428
Prevent implicit instantiations of the Array class template (bug #61711).
* liboctave/array/Array-base.cc: Rename from liboctave/array/Array.cc.
* liboctave/array/Array-C.cc, liboctave/array/Array-b.cc,
liboctave/array/Array-ch.cc, liboctave/array/Array-d.cc,
liboctave/array/Array-f.cc, liboctave/array/Array-fC.cc,
liboctave/array/Array-i.cc, liboctave/array/Array-idx-vec.cc,
liboctave/array/Array-s.cc, liboctave/array/Array-str.cc,
liboctave/array/Array-voidp.cc: Include renamed file.
* liboctave/array/Array-oct.cc: Add new file that includes "Array-base.cc" and
contains extern template declarations for Array<T> classes that are exported by
liboctave.
* libinterp/template-inst/Array-tc.cc: Include "Array-oct.cc". Remove extern
template declarations that are no longer needed.
* libinterp/template-inst/Array.cc: Add new file that includes "Array-oct.cc"
and contains extern template declarations for Array<T> classes that are exported
by liboctinterp.
* liboctave/array/module.mk: Use renamed file and add new file to list of
installed template files.
* libinterp/template-inst/module.mk: Add new file to build system.
* libinterp/module.mk: Install new template file.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sat, 05 Nov 2022 13:48:24 +0100 |
parents | 42990806eb9d |
children | e7fc6251b698 |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 1994-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 "oct-inttypes-fwd.h" // Instantiate Arrays of integer values. #include "Array.h" #include "Array-base.cc" #define INLINE_ASCENDING_SORT 1 #define INLINE_DESCENDING_SORT 1 #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 Array<octave::idx_vector>; template class octave_sort<signed char>; //template class octave_sort<short>; template class octave_sort<int>; template class octave_sort<long>; #if defined (OCTAVE_HAVE_LONG_LONG_INT) template class octave_sort<long long>; #endif INSTANTIATE_ARRAY (signed char, OCTAVE_API); //INSTANTIATE_ARRAY (short, OCTAVE_API); INSTANTIATE_ARRAY (int, OCTAVE_API); INSTANTIATE_ARRAY (long, OCTAVE_API); #if defined (OCTAVE_HAVE_LONG_LONG_INT) INSTANTIATE_ARRAY (long long, OCTAVE_API); #endif template class octave_sort<unsigned char>; template class octave_sort<unsigned short>; template class octave_sort<unsigned int>; template class octave_sort<unsigned long>; #if defined (OCTAVE_HAVE_UNSIGNED_LONG_LONG_INT) template class octave_sort<unsigned long long>; #endif INSTANTIATE_ARRAY (unsigned char, OCTAVE_API); INSTANTIATE_ARRAY (unsigned short, OCTAVE_API); INSTANTIATE_ARRAY (unsigned int, OCTAVE_API); INSTANTIATE_ARRAY (unsigned long, OCTAVE_API); #if defined (OCTAVE_HAVE_UNSIGNED_LONG_LONG_INT) INSTANTIATE_ARRAY (unsigned long long, OCTAVE_API); #endif template class octave_sort<octave_int8>; template class octave_sort<octave_int16>; template class octave_sort<octave_int32>; template class octave_sort<octave_int64>; INSTANTIATE_ARRAY (octave_int8, OCTAVE_API); INSTANTIATE_ARRAY (octave_int16, OCTAVE_API); INSTANTIATE_ARRAY (octave_int32, OCTAVE_API); INSTANTIATE_ARRAY (octave_int64, OCTAVE_API); template class octave_sort<octave_uint8>; template class octave_sort<octave_uint16>; template class octave_sort<octave_uint32>; template class octave_sort<octave_uint64>; INSTANTIATE_ARRAY (octave_uint8, OCTAVE_API); INSTANTIATE_ARRAY (octave_uint16, OCTAVE_API); INSTANTIATE_ARRAY (octave_uint32, OCTAVE_API); INSTANTIATE_ARRAY (octave_uint64, OCTAVE_API); #include "DiagArray2.h" #include "DiagArray2.cc" template class DiagArray2<int>;