comparison liboctave/array/Array-voidp.cc @ 21574:ae4d7dfea337

maint: merge stable to default.
author John W. Eaton <jwe@octave.org>
date Fri, 01 Apr 2016 12:57:49 -0400
parents 40de9f8f23a6 f3f8e1d3e399
children aba2e6293dd8
comparison
equal deleted inserted replaced
21571:feac06371be1 21574:ae4d7dfea337
29 // Instantiate Arrays of void *. 29 // Instantiate Arrays of void *.
30 30
31 #include "Array.h" 31 #include "Array.h"
32 #include "Array.cc" 32 #include "Array.cc"
33 33
34 // Prevent implicit instantiations on some systems (Windows, others?)
35 // that can lead to duplicate definitions of static data members.
36
37 extern template class OCTAVE_API Array<idx_vector>;
38 extern template class OCTAVE_API Array<octave_idx_type>;
39
34 NO_INSTANTIATE_ARRAY_SORT (void *); 40 NO_INSTANTIATE_ARRAY_SORT (void *);
35 41
36 INSTANTIATE_ARRAY (void *, OCTAVE_API); 42 INSTANTIATE_ARRAY (void *, OCTAVE_API);