Mercurial > octave
diff libinterp/octave-value/ov-complex.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 | 66cae7a6dc47 |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-complex.cc Thu Mar 31 14:12:13 2016 -0700 +++ b/libinterp/octave-value/ov-complex.cc Fri Apr 01 12:57:49 2016 -0400 @@ -50,6 +50,13 @@ #include "ls-oct-text.h" #include "ls-hdf5.h" +// Prevent implicit instantiations on some systems (Windows, others?) +// that can lead to duplicate definitions of static data members. + +extern template class OCTINTERP_API octave_base_scalar<double>; +extern template class OCTINTERP_API octave_base_scalar<FloatComplex>; + + template class octave_base_scalar<Complex>;