Merge "master" into "output".

[pspp-builds.git] / src / data / dictionary.c

diff --git a/src/data/dictionary.c b/src/data/dictionary.c
index 67af049b24fee7a72e3dd6b6561a6784f87a70b7..1ddf5575aa68c4877f77fea845d3b4e6ea567ccc 100644 (file)
--- a/src/data/dictionary.c
+++ b/src/data/dictionary.c
@@ -119,7 +119,7 @@ dict_dump (const struct dictionary *d)
     {
       const struct variable *v =
        d->var[i];
-      printf ("Name: %s;\tdict_idx: %d; case_idx: %d\n",
+      printf ("Name: %s;\tdict_idx: %zu; case_idx: %zu\n",
              var_get_name (v),
              var_get_dict_index (v),
              var_get_case_index (v));
@@ -1016,7 +1016,7 @@ dict_set_case_limit (struct dictionary *d, casenumber case_limit)
 const struct caseproto *
 dict_get_proto (const struct dictionary *d_)
 {
-  struct dictionary *d = (struct dictionary *) d_;
+  struct dictionary *d = CONST_CAST (struct dictionary *, d_);
   if (d->proto == NULL)
     {
       size_t i;
@@ -1375,7 +1375,7 @@ dict_clear_vectors (struct dictionary *d)
 struct attrset *
 dict_get_attributes (const struct dictionary *d) 
 {
-  return (struct attrset *) &d->attributes;
+  return CONST_CAST (struct attrset *, &d->attributes);
 }
 
 /* Replaces D's attributes set by a copy of ATTRS. */