Mercurial > octave

diff liboctave/array/Array-d.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
line wrap: on
line diff
--- a/liboctave/array/Array-d.cc	Thu Mar 31 14:12:13 2016 -0700
+++ b/liboctave/array/Array-d.cc	Fri Apr 01 12:57:49 2016 -0400
@@ -36,6 +36,12 @@
 #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 OCTAVE_API Array<idx_vector>;
+extern template class OCTAVE_API Array<octave_idx_type>;
+
 template <>
 inline bool
 sort_isnan<double> (double x)