Mercurial > octave
comparison libinterp/octave-value/ov-uint16.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 |
---|---|
54 #include "byte-swap.h" | 54 #include "byte-swap.h" |
55 #include "ls-oct-text.h" | 55 #include "ls-oct-text.h" |
56 #include "ls-utils.h" | 56 #include "ls-utils.h" |
57 #include "ls-hdf5.h" | 57 #include "ls-hdf5.h" |
58 | 58 |
59 // Prevent implicit instantiations on some systems (Windows, others?) | |
60 // that can lead to duplicate definitions of static data members. | |
61 | |
62 extern template class OCTINTERP_API octave_base_scalar<double>; | |
63 | |
64 | |
59 template class octave_base_matrix<uint16NDArray>; | 65 template class octave_base_matrix<uint16NDArray>; |
60 | 66 |
61 template class octave_base_int_matrix<uint16NDArray>; | 67 template class octave_base_int_matrix<uint16NDArray>; |
62 | 68 |
63 | 69 |