Fixed some compiler warnings, which arose from recent commits.

[pspp] / src / math / categoricals.h

diff --git a/src/math/categoricals.h b/src/math/categoricals.h
index c221cd5694fcc81867f28ebcbd041fbe5ab0cc7d..62ff10c100ea4c778c0d4a0d316217cd99f981be 100644 (file)
--- a/src/math/categoricals.h
+++ b/src/math/categoricals.h
@@ -29,7 +29,8 @@ struct interaction;
 union value ;
 
 struct categoricals *categoricals_create (struct interaction *const *, size_t n_int,
-                                         const struct variable *wv, enum mv_class exclude);
+                                         const struct variable *wv, enum mv_class dep_excl,
+                                         enum mv_class fctr_excl);
 
 void categoricals_destroy (struct categoricals *);
 
@@ -56,7 +57,6 @@ size_t categoricals_df_total (const struct categoricals *cat);
 */
 size_t categoricals_get_n_variables (const struct categoricals *cat);
 
-
 bool categoricals_is_complete (const struct categoricals *cat);
 
 
@@ -66,7 +66,9 @@ bool categoricals_is_complete (const struct categoricals *cat);
   If this function returns false, then no calls to _by_subscript or *_by_category
   are allowed.
 */
-bool categoricals_done (const struct categoricals *cat);
+void categoricals_done (const struct categoricals *cat);
+
+bool categoricals_sane (const struct categoricals *cat);
 
 
 /*
@@ -85,8 +87,6 @@ double categoricals_get_code_for_case (const struct categoricals *cat, int subsc
 
 /* These use the long map.  Useful for descriptive statistics. */
 
-/* Return the value corresponding to the N'th category */
-const union value * categoricals_get_value_by_category (const struct categoricals *cat, int n);
 
 const struct ccase *
 categoricals_get_case_by_category_real (const struct categoricals *cat, int iact, int n);
@@ -104,6 +104,7 @@ struct payload
 {
   void* (*create)  (const void *aux1, void *aux2);
   void (*update)  (const void *aux1, void *aux2, void *user_data, const struct ccase *, double weight);
+  void (*calculate) (const void *aux1, void *aux2, void *user_data);
   void (*destroy) (const void *aux1, void *aux2, void *user_data);
 };