From 3e585a41b392ecbd7b99e9fafea9bfa3463ee2df Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Sun, 15 Jun 2014 22:30:39 -0400 Subject: [PATCH] Clean up some compiler warnings on 32-bit. --- src/expr/pickle_data.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/expr/pickle_data.h b/src/expr/pickle_data.h index beff1f8a9..2224c4f99 100644 --- a/src/expr/pickle_data.h +++ b/src/expr/pickle_data.h @@ -49,27 +49,27 @@ const unsigned NBITS_NCHILDREN = __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN; const unsigned NBITS_CONSTBLOCKS = 32; struct BlockHeader { - unsigned d_kind : NBITS_KIND; + uint64_t d_kind : NBITS_KIND; };/* struct BlockHeader */ struct BlockHeaderOperator { - unsigned d_kind : NBITS_KIND; - unsigned d_nchildren : NBITS_NCHILDREN; - unsigned long : NBITS_BLOCK - (NBITS_KIND + NBITS_NCHILDREN); + uint64_t d_kind : NBITS_KIND; + uint64_t d_nchildren : NBITS_NCHILDREN; + uint64_t : NBITS_BLOCK - (NBITS_KIND + NBITS_NCHILDREN); };/* struct BlockHeaderOperator */ struct BlockHeaderConstant { - unsigned d_kind : NBITS_KIND; - unsigned long d_constblocks : NBITS_BLOCK - NBITS_KIND; + uint64_t d_kind : NBITS_KIND; + uint64_t d_constblocks : NBITS_BLOCK - NBITS_KIND; };/* struct BlockHeaderConstant */ struct BlockHeaderVariable { - unsigned d_kind : NBITS_KIND; - unsigned long : NBITS_BLOCK - NBITS_KIND; + uint64_t d_kind : NBITS_KIND; + uint64_t : NBITS_BLOCK - NBITS_KIND; };/* struct BlockHeaderVariable */ struct BlockBody { - unsigned long d_data : NBITS_BLOCK; + uint64_t d_data : NBITS_BLOCK; };/* struct BlockBody */ union Block { -- 2.30.2