Mercurial > octave
annotate liboctave/array/MArray-i.cc @ 21140:e06e600f396a
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 |
| rev | line source |
|---|---|
| 1573 | 1 /* |
| 2 | |
|
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
3 Copyright (C) 1995-2015 John W. Eaton |
| 1573 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 1573 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 1573 | 20 |
| 21 */ | |
| 22 | |
| 2006 | 23 #ifdef HAVE_CONFIG_H |
| 24 #include <config.h> | |
| 25 #endif | |
| 26 | |
| 4902 | 27 #include "oct-inttypes.h" |
| 28 | |
| 1573 | 29 // Instantiate MArrays of int values. |
| 30 | |
| 31 #include "MArray.h" | |
| 32 #include "MArray.cc" | |
| 33 | |
| 6708 | 34 template class OCTAVE_API MArray<int>; |
|
21140
e06e600f396a
eliminate use of USE_64_BIT_IDX_T
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
35 #if defined (ENABLE_64) |
|
16313
6aafe87a3144
use int64_t for idx type if --enable-64
John W. Eaton <jwe@octave.org>
parents:
15271
diff
changeset
|
36 template class OCTAVE_API MArray<int64_t>; |
|
6aafe87a3144
use int64_t for idx type if --enable-64
John W. Eaton <jwe@octave.org>
parents:
15271
diff
changeset
|
37 #endif |
| 1989 | 38 |
|
13732
f8bef53122c8
[MSVC] Explicit instantiation to avoid undefined references.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
11523
diff
changeset
|
39 // Explicit instantiation, as this seems to be required by weird compilers |
|
f8bef53122c8
[MSVC] Explicit instantiation to avoid undefined references.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
11523
diff
changeset
|
40 // like MSVC. This should be harmless on other compilers. |
|
f8bef53122c8
[MSVC] Explicit instantiation to avoid undefined references.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
11523
diff
changeset
|
41 template int xmin<int> (int, int); |
|
f8bef53122c8
[MSVC] Explicit instantiation to avoid undefined references.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
11523
diff
changeset
|
42 template int xmax<int> (int, int); |
|
f8bef53122c8
[MSVC] Explicit instantiation to avoid undefined references.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
11523
diff
changeset
|
43 template long xmin<long> (long, long); |
|
f8bef53122c8
[MSVC] Explicit instantiation to avoid undefined references.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
11523
diff
changeset
|
44 template long xmax<long> (long, long); |
|
f8bef53122c8
[MSVC] Explicit instantiation to avoid undefined references.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
11523
diff
changeset
|
45 |
| 6708 | 46 INSTANTIATE_MARRAY_FRIENDS (int, OCTAVE_API) |
|
21140
e06e600f396a
eliminate use of USE_64_BIT_IDX_T
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
47 #if defined (ENABLE_64) |
|
16313
6aafe87a3144
use int64_t for idx type if --enable-64
John W. Eaton <jwe@octave.org>
parents:
15271
diff
changeset
|
48 INSTANTIATE_MARRAY_FRIENDS (int64_t, OCTAVE_API) |
|
6aafe87a3144
use int64_t for idx type if --enable-64
John W. Eaton <jwe@octave.org>
parents:
15271
diff
changeset
|
49 #endif |
| 1989 | 50 |
| 6708 | 51 template class OCTAVE_API MArray<octave_int8>; |
| 52 template class OCTAVE_API MArray<octave_int16>; | |
| 53 template class OCTAVE_API MArray<octave_int32>; | |
| 54 template class OCTAVE_API MArray<octave_int64>; | |
| 4902 | 55 |
| 6708 | 56 INSTANTIATE_MARRAY_FRIENDS (octave_int8, OCTAVE_API) |
| 57 INSTANTIATE_MARRAY_FRIENDS (octave_int16, OCTAVE_API) | |
| 58 INSTANTIATE_MARRAY_FRIENDS (octave_int32, OCTAVE_API) | |
| 59 INSTANTIATE_MARRAY_FRIENDS (octave_int64, OCTAVE_API) | |
| 4902 | 60 |
| 6708 | 61 template class OCTAVE_API MArray<octave_uint8>; |
| 62 template class OCTAVE_API MArray<octave_uint16>; | |
| 63 template class OCTAVE_API MArray<octave_uint32>; | |
| 64 template class OCTAVE_API MArray<octave_uint64>; | |
| 4902 | 65 |
| 6708 | 66 INSTANTIATE_MARRAY_FRIENDS (octave_uint8, OCTAVE_API) |
| 67 INSTANTIATE_MARRAY_FRIENDS (octave_uint16, OCTAVE_API) | |
| 68 INSTANTIATE_MARRAY_FRIENDS (octave_uint32, OCTAVE_API) | |
| 69 INSTANTIATE_MARRAY_FRIENDS (octave_uint64, OCTAVE_API) | |
| 4902 | 70 |
| 1989 | 71 #include "MDiagArray2.h" |
| 72 #include "MDiagArray2.cc" | |
| 73 | |
| 6708 | 74 template class OCTAVE_API MDiagArray2<int>; |
| 1573 | 75 |
| 6708 | 76 INSTANTIATE_MDIAGARRAY2_FRIENDS (int, OCTAVE_API) |