From f87d813b6339efe1f7b96028cce0df2d96bae507 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Tue, 29 Mar 2016 20:05:34 -0700 Subject: Replace all stray C style casts with macros. * gc.c (gc_report_copies): C style casts found in this function. * linenoise.c (strip_qual, convert, coerce): Copy and paste the macros here. (record_undo, compare_completions, lino_add_completion, history_search, ab_append, sync_data_to_buf, refresh_singleline, screen_rows, refresh_multiline, find_nearest_paren, paren_jump, yank_sel, edit_move_matching_paren, edit, lino_make, lino_copy, lino_hist_add, lino_hist_set_max_len): C style casts replaced. * mpi/mpi-types.h (MP_DIGIT_BIT, MP_DIGIT_MAX, MP_WORD_BIT, MP_WORD_MAX, RADIX): C style casts replaced. * mpi/mpi.c (convert, coerce): Copy and paste the macros here. (mp_init_size, mp_init_copy, mp_copy, mp_set_int, mp_div_d, mp_bit, mp_to_double, mp_to_signed_bin, mp_to_unsigned_bin, mp_to_unsigned_buf, mp_toradix_case, mp_grow, s_mp_set_bit, s_mp_mod_2d, s_mp_mul_2d, s_mp_div_2d, s_mp_mul_d, s_mp_mul, s_mp_sqr, s_mp_div, s_mp_2expt, s_mp_todigit): C style casts replaced. * mpi/mplogic (convert): Macro copy and pasted here. (mpl_num_set, mpl_num_clear): C style casts replaced. * parser.c (provide_completions): Likewise. * signal.c (small_sigfillset): Likewise. * stream.c (stdio_truncate, test_set_indent_mode, set_indent_mode): Likewise. --- mpi/mplogic.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'mpi/mplogic.c') diff --git a/mpi/mplogic.c b/mpi/mplogic.c index eb44b866..63baeef9 100644 --- a/mpi/mplogic.c +++ b/mpi/mplogic.c @@ -16,6 +16,12 @@ #endif #include +#ifdef __cplusplus +#define convert(TYPE, EXPR) (static_cast(EXPR)) +#else +#define convert(TYPE, EXPR) ((TYPE) (EXPR)) +#endif + /* Some things from the guts of the MPI library we make use of... */ extern mp_err s_mp_lshd(mp_int *mp, mp_size p); extern void s_mp_rshd(mp_int *mp, mp_size p); @@ -293,7 +299,7 @@ mp_err mpl_num_set(mp_int *a, int *num) for(ix = 0; ix < USED(a); ix++) { cur = DIGIT(a, ix); - for(db = 0; db < (int) sizeof(mp_digit); db++) { + for(db = 0; db < convert(int, sizeof(mp_digit)); db++) { reg = (cur >> (CHAR_BIT * db)) & UCHAR_MAX; nset += bitc[reg]; @@ -322,7 +328,7 @@ mp_err mpl_num_clear(mp_int *a, int *num) for(ix = 0; ix < USED(a); ix++) { cur = DIGIT(a, ix); - for(db = 0; db < (int) sizeof(mp_digit); db++) { + for(db = 0; db < convert(int, sizeof(mp_digit)); db++) { reg = (cur >> (CHAR_BIT * db)) & UCHAR_MAX; nset += bitc[UCHAR_MAX - reg]; -- cgit v1.2.3