Mercurial > jwe > octave
comparison libinterp/octave-value/ov.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 | 538b57866b90 |
children | fcac5dbbf9ed |
comparison
equal
deleted
inserted
replaced
21139:538b57866b90 | 21140:e06e600f396a |
---|---|
1519 // needing definitions for the SIZEOF_X macros in ov.h. | 1519 // needing definitions for the SIZEOF_X macros in ov.h. |
1520 | 1520 |
1521 octave_idx_type | 1521 octave_idx_type |
1522 octave_value::idx_type_value (bool req_int, bool frc_str_conv) const | 1522 octave_value::idx_type_value (bool req_int, bool frc_str_conv) const |
1523 { | 1523 { |
1524 #if defined (USE_64_BIT_IDX_T) | 1524 #if defined (ENABLE_64) |
1525 return int64_value (req_int, frc_str_conv); | 1525 return int64_value (req_int, frc_str_conv); |
1526 #else | 1526 #else |
1527 return int_value (req_int, frc_str_conv); | 1527 return int_value (req_int, frc_str_conv); |
1528 #endif | 1528 #endif |
1529 } | 1529 } |