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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 7f9f62e74275079bac8b5f7e9ad3ed614fdbabe2
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Wed Jul 6 10:53:25 2005 +1000

    Fix for deprecated casts in gfs_object_simulation()
    
    darcs-hash:20050706005325-fbd8f-0879c0167d4a146ca3ec68767ce79394eb687e89.gz

diff --git a/src/simulation.c b/src/simulation.c
index 0e81a18..09477e2 100644
--- a/src/simulation.c
+++ b/src/simulation.c
@@ -451,7 +451,7 @@ static void simulation_read (GtsObject ** object, GtsFile * fp)
       }
 
       object = gts_object_new (klass);
-      gfs_object_simulation (object) = sim;
+      gfs_object_simulation_set (object, sim);
 
       g_assert (klass->read);
       (* klass->read) (&object, fp);
diff --git a/src/simulation.h b/src/simulation.h
index 90c613e..ca29ce1 100644
--- a/src/simulation.h
+++ b/src/simulation.h
@@ -118,6 +118,7 @@ void                 gfs_physical_params_read    (GfsPhysicalParams * p,
 						  GtsFile * fp);
 void                 gfs_simulation_run          (GfsSimulation * sim);
 #define              gfs_object_simulation(o)     GFS_SIMULATION(GTS_OBJECT (o)->reserved)
+#define              gfs_object_simulation_set(o,s) (GTS_OBJECT (o)->reserved = (s))
 
 /* GfsAdvection: Header */
 
diff --git a/src/source.c b/src/source.c
index d9079f6..9c21320 100644
--- a/src/source.c
+++ b/src/source.c
@@ -638,7 +638,7 @@ static void source_diffusion_read (GtsObject ** o, GtsFile * fp)
     return;
   }
 
-  gfs_object_simulation (d->D) = gfs_object_simulation (d);
+  gfs_object_simulation_set (d->D, gfs_object_simulation (d));
   (* GTS_OBJECT (d->D)->klass->read) ((GtsObject **) &d->D, fp);
 }
 

-- 
Gerris Flow Solver