Fix NodeValue bitfields for 32-bit; fix comment.

diff --git a/src/expr/node_value.h b/src/expr/node_value.h
index 24132491a2cff30ae9dd9b6469c2f49875c80416..5c73b39b5420df781595db61f521706d6dc9bc47 100644 (file)
--- a/src/expr/node_value.h
+++ b/src/expr/node_value.h
@@ -89,19 +89,19 @@ class NodeValue {
   /** A mask for d_kind */
   static const unsigned kindMask = (1u << NBITS_KIND) - 1;
 
-  // this header fits into one 64-bit word
+  // This header fits into 96 bits
 
   /** The ID (0 is reserved for the null value) */
-  unsigned long d_id        : NBITS_ID;
+  uint64_t d_id        : NBITS_ID;
 
   /** The expression's reference count.  @see cvc4::Node. */
-  unsigned d_rc        : NBITS_REFCOUNT;
+  uint64_t d_rc        : NBITS_REFCOUNT;
 
   /** Kind of the expression */
-  unsigned d_kind      : NBITS_KIND;
+  uint64_t d_kind      : NBITS_KIND;
 
   /** Number of children */
-  unsigned d_nchildren : NBITS_NCHILDREN;
+  uint64_t d_nchildren : NBITS_NCHILDREN;
 
   /** Variable number of child nodes */
   NodeValue* d_children[0];