[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 952a82e895373dba1d3e17d2d7f38b498c9970f5
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Tue Oct 4 14:54:58 2005 +1000

    Fix for type cast bothering gcc
    
    darcs-hash:20051004045458-fbd8f-2d9fd5b53b853dcb49817ca67558fca0b24bf1ff.gz

diff --git a/src/domain.c b/src/domain.c
index 2c96494..12a45aa 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -1698,7 +1698,7 @@ static void box_split (GfsBox * box, gpointer * data)
 	  FttCell * neighbor = ftt_cell_neighbor (child.c[i], d);
 	  GfsBox * newbox = GFS_DOUBLE_TO_POINTER (GFS_VARIABLE (child.c[i], newboxp->i));
 	  GfsBoundaryClass * klass = GFS_BOUNDARY_CLASS (GTS_OBJECT (boundary)->klass);
-	  GfsBoundary * newboundary = gfs_boundary_new (klass, newbox, d);
+	  GtsObject * newboundary = GTS_OBJECT (gfs_boundary_new (klass, newbox, d));
 	  gchar fname[] = "/tmp/XXXXXX";
 	  gint fd = mkstemp (fname);
 	  FILE * fp = fdopen (fd, "w");
@@ -1710,13 +1710,13 @@ static void box_split (GfsBox * box, gpointer * data)
 	  fp = fopen (fname, "r");
 	  unlink (fname);
 	  gfp = gts_file_new (fp);
-	  (* GTS_OBJECT_CLASS (klass)->read) ((GtsObject **) &newboundary, gfp);
+	  (* GTS_OBJECT_CLASS (klass)->read) (&newboundary, gfp);
 	  g_assert (gfp->type != GTS_ERROR);
 	  gts_file_destroy (gfp);
 	  fclose (fp);
 
 	  g_assert (neighbor);
-	  newboundary->root = neighbor;
+	  GFS_BOUNDARY (newboundary)->root = neighbor;
 	}
       gts_object_destroy (GTS_OBJECT (boundary));
     }

-- 
Gerris Flow Solver