Mercurial > octave
view liboctave/array/Array-b.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 | 796f54d4ddbf |
children | e7fc6251b698 |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 1996-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 // Instantiate Arrays of bool 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>; extern template class Array<octave_idx_type>; // Specialize bool sorting (aka stable partitioning). template <bool desc> static void do_bool_partition (bool *data, octave_idx_type nel) { octave_idx_type k = 0; for (octave_idx_type i = 0; i < nel; i++) if (data[i] == desc) data[k++] = desc; for (octave_idx_type i = k; i < nel; i++) data[i] = ! desc; } template <bool desc> static void do_bool_partition (bool *data, octave_idx_type *idx, octave_idx_type nel) { // FIXME: This is essentially a simple bucket sort. // Can it be efficiently done by std::partition? OCTAVE_LOCAL_BUFFER (octave_idx_type, jdx, nel); octave_idx_type k = 0; octave_idx_type l = 0; for (octave_idx_type i = 0; i < nel; i++) { if (data[i] == desc) { data[k] = desc; idx[k++] = idx[i]; } else jdx[l++] = idx[i]; } for (octave_idx_type i = k; i < nel; i++) { data[i] = ! desc; idx[i] = jdx[i-k]; } } template <> template <> void octave_sort<bool>::sort (bool *data, octave_idx_type nel, std::less<bool>) { do_bool_partition<false> (data, nel); } template <> template <> void octave_sort<bool>::sort (bool *data, octave_idx_type nel, std::greater<bool>) { do_bool_partition<true> (data, nel); } template <> template <> void octave_sort<bool>::sort (bool *data, octave_idx_type *idx, octave_idx_type nel, std::less<bool>) { do_bool_partition<false> (data, idx, nel); } template <> template <> void octave_sort<bool>::sort (bool *data, octave_idx_type *idx, octave_idx_type nel, std::greater<bool>) { do_bool_partition<true> (data, idx, nel); } template class octave_sort<bool>; INSTANTIATE_ARRAY (bool, OCTAVE_API); template OCTAVE_API std::ostream& operator << (std::ostream&, const Array<bool>&); #include "DiagArray2.h" #include "DiagArray2.cc" template class DiagArray2<bool>;