From: Morgan Deters <mdeters@cs.nyu.edu>
Date: Mon, 16 Jun 2014 02:30:39 +0000 (-0400)
Subject: Clean up some compiler warnings on 32-bit.
X-Git-Tag: cvc5-1.0.0~6795
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c49991b10bbf284082bb87c8094ff88a20828dfd;p=cvc5.git

Clean up some compiler warnings on 32-bit.
---

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 {