Mercurial > octave

comparison libinterp/template-inst/Array-tc.cc @ 21574:ae4d7dfea337

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
28 28
29 #include "Array.h" 29 #include "Array.h"
30 #include "Array.cc" 30 #include "Array.cc"
31 31
32 #include "ov.h" 32 #include "ov.h"
33 #include "ov-classdef.h"
33 34
34 #include "oct-sort.cc" 35 #include "oct-sort.cc"
35 36
37 // Prevent implicit instantiations on some systems (Windows, others?)
38 // that can lead to duplicate definitions of static data members.
39
40 extern template class OCTAVE_API Array<Complex>;
41 extern template class OCTAVE_API Array<FloatComplex>;
42 extern template class OCTAVE_API Array<bool>;
43 extern template class OCTAVE_API Array<char>;
44 extern template class OCTAVE_API Array<double>;
45 extern template class OCTAVE_API Array<float>;
46 extern template class OCTAVE_API Array<idx_vector>;
47 extern template class OCTAVE_API Array<octave_idx_type>;
48 extern template class OCTAVE_API Array<std::string>;
49
36 NO_INSTANTIATE_ARRAY_SORT (octave_value); 50 NO_INSTANTIATE_ARRAY_SORT (octave_value);
51 INSTANTIATE_ARRAY (octave_value, OCTINTERP_API);
37 52
38 INSTANTIATE_ARRAY (octave_value, OCTINTERP_API); 53 NO_INSTANTIATE_ARRAY_SORT (cdef_object);
54 INSTANTIATE_ARRAY (cdef_object, OCTINTERP_API);