X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fbinomial.c;h=8126daf36c725d80652a6add4db7098c35dcdd72;hb=9895af61788837886be8b30fdb2baf46f9f0724a;hp=3287509c982c3398dcee96a0e17eea4ea21b929d;hpb=56a406350be35a60d42b51d255f6f93793ac1fab;p=pspp-builds.git

diff --git a/src/language/stats/binomial.c b/src/language/stats/binomial.c
index 3287509c..8126daf3 100644
--- a/src/language/stats/binomial.c
+++ b/src/language/stats/binomial.c
@@ -88,15 +88,15 @@ calculate_binomial_internal (double n1, double n2, double p)
 static bool
 do_binomial (const struct dictionary *dict,
 	     struct casereader *input,
-	     const struct binomial_test *bst,
+	     const struct one_sample_test *ost,
 	     struct freq *cat1,
 	     struct freq *cat2,
              enum mv_class exclude
 	     )
 {
+  const struct binomial_test *bst = UP_CAST (ost, const struct binomial_test, parent);
   bool warn = true;
 
-  const struct one_sample_test *ost = (const struct one_sample_test *) bst;
   struct ccase *c;
 
   for (; (c = casereader_read (input)) != NULL; case_unref (c))
@@ -155,8 +155,8 @@ binomial_execute (const struct dataset *ds,
 {
   int v;
   const struct dictionary *dict = dataset_dict (ds);
-  const struct binomial_test *bst = (const struct binomial_test *) test;
-  const struct one_sample_test *ost = (const struct one_sample_test*) test;
+  const struct one_sample_test *ost = UP_CAST (test, const struct one_sample_test, parent);
+  const struct binomial_test *bst = UP_CAST (ost, const struct binomial_test, parent);
 
   struct freq *cat[2];
   int i;
@@ -179,7 +179,7 @@ binomial_execute (const struct dataset *ds,
         }
     }
 
-  if (do_binomial (dataset_dict (ds), input, bst, cat[0], cat[1], exclude))
+  if (do_binomial (dataset_dict (ds), input, ost, cat[0], cat[1], exclude))
     {
       const struct variable *wvar = dict_get_weight (dict);
       const struct fmt_spec *wfmt = wvar ?