Mercurial > octave

comparison libinterp/template-inst/Array-jit.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
29 #ifdef HAVE_LLVM 29 #ifdef HAVE_LLVM
30 30
31 #include "Array.h" 31 #include "Array.h"
32 #include "Array.cc" 32 #include "Array.cc"
33 33
34 #include "jit-ir.h"
35
36 // Prevent implicit instantiations on some systems (Windows, others?)
37 // that can lead to duplicate definitions of static data members.
38
39 extern template class OCTAVE_API Array<idx_vector>;
34 extern template class OCTAVE_API Array<octave_idx_type>; 40 extern template class OCTAVE_API Array<octave_idx_type>;
35
36 #include "jit-ir.h"
37 41
38 NO_INSTANTIATE_ARRAY_SORT (jit_function); 42 NO_INSTANTIATE_ARRAY_SORT (jit_function);
39 43
40 INSTANTIATE_ARRAY (jit_function, OCTINTERP_API); 44 INSTANTIATE_ARRAY (jit_function, OCTINTERP_API);
41 45