Mercurial > jwe > octave

comparison liboctave/array/MArray-i.cc @ 21140:e06e600f396a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate use of USE_64_BIT_IDX_T * common.mk (do_subst_config_vals, do_subst_cross_config_vals): Don't substitute OCTAVE_CONF_USE_64_BIT_IDX_T. * toplev.cc (octave_config_info): Set USE_64_BIT_IDX_T from OCTAVE_CONF_ENABLE_64. * oct-conf.in.h (OCTAVE_CONF_USE_64_BIT_IDX_T): Delete macro. * oct-hdf5.h, amd.cc, ccolamd.cc, colamd.cc, dmperm.cc, symbfact.cc, ov.cc, CSparse.cc, CSparse.h, MArray-i.cc, dSparse.cc, dSparse.h, SparseCmplxQR.h, SparseQR.h, sparse-base-chol.cc, lo-array-errwarn.cc, lo-array-gripes.cc, oct-sparse.h, acinclude.m4, oct-conf-post.in.h, computer.m: Use ENABLE_64 instead of USE_64_BIT_IDX_T.
author John W. Eaton <jwe@octave.org>
date Mon, 25 Jan 2016 19:16:31 -0500
parents 4197fc428c7d
children f7121e111991
comparison
equal deleted inserted replaced
21139:538b57866b90 21140:e06e600f396a
30 30
31 #include "MArray.h" 31 #include "MArray.h"
32 #include "MArray.cc" 32 #include "MArray.cc"
33 33
34 template class OCTAVE_API MArray<int>; 34 template class OCTAVE_API MArray<int>;
35 #ifdef USE_64_BIT_IDX_T 35 #if defined (ENABLE_64)
36 template class OCTAVE_API MArray<int64_t>; 36 template class OCTAVE_API MArray<int64_t>;
37 #endif 37 #endif
38 38
39 // Explicit instantiation, as this seems to be required by weird compilers 39 // Explicit instantiation, as this seems to be required by weird compilers
40 // like MSVC. This should be harmless on other compilers. 40 // like MSVC. This should be harmless on other compilers.
42 template int xmax<int> (int, int); 42 template int xmax<int> (int, int);
43 template long xmin<long> (long, long); 43 template long xmin<long> (long, long);
44 template long xmax<long> (long, long); 44 template long xmax<long> (long, long);
45 45
46 INSTANTIATE_MARRAY_FRIENDS (int, OCTAVE_API) 46 INSTANTIATE_MARRAY_FRIENDS (int, OCTAVE_API)
47 #ifdef USE_64_BIT_IDX_T 47 #if defined (ENABLE_64)
48 INSTANTIATE_MARRAY_FRIENDS (int64_t, OCTAVE_API) 48 INSTANTIATE_MARRAY_FRIENDS (int64_t, OCTAVE_API)
49 #endif 49 #endif
50 50
51 template class OCTAVE_API MArray<octave_int8>; 51 template class OCTAVE_API MArray<octave_int8>;
52 template class OCTAVE_API MArray<octave_int16>; 52 template class OCTAVE_API MArray<octave_int16>;