From a93eaa54527a83bbfe01405ae3893f051e2537cf Mon Sep 17 00:00:00 2001
From: Bert Vandenbroucke <bert.vandenbroucke@ugent.be>
Date: Wed, 17 Aug 2016 12:28:46 +0100
Subject: [PATCH] Fixed some compilation errors in GIZMO specific code caused
by merge with master.
---
src/engine.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/engine.c b/src/engine.c
index 7394859e4c..2cdde3d52d 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -1608,9 +1608,9 @@ void engine_make_extra_hydroloop_tasks(struct engine *e) {
sched, task_type_self, task_subtype_force, 0, 0, t->ci, NULL, 0);
/* Add the link between the new loops and the cell */
- t->ci->gradient = engine_addlink(e, t->ci->gradient, t2);
+ engine_addlink(e, &t->ci->gradient, t2);
atomic_inc(&t->ci->nr_gradient);
- t->ci->force = engine_addlink(e, t->ci->force, t3);
+ engine_addlink(e, &t->ci->force, t3);
atomic_inc(&t->ci->nr_force);
/* Now, build all the dependencies for the hydro */
@@ -1642,13 +1642,13 @@ void engine_make_extra_hydroloop_tasks(struct engine *e) {
sched, task_type_pair, task_subtype_force, 0, 0, t->ci, t->cj, 0);
/* Add the link between the new loop and both cells */
- t->ci->gradient = engine_addlink(e, t->ci->gradient, t2);
+ engine_addlink(e, &t->ci->gradient, t2);
atomic_inc(&t->ci->nr_gradient);
- t->cj->gradient = engine_addlink(e, t->cj->gradient, t2);
+ engine_addlink(e, &t->cj->gradient, t2);
atomic_inc(&t->cj->nr_gradient);
- t->ci->force = engine_addlink(e, t->ci->force, t3);
+ engine_addlink(e, &t->ci->force, t3);
atomic_inc(&t->ci->nr_force);
- t->cj->force = engine_addlink(e, t->cj->force, t3);
+ engine_addlink(e, &t->cj->force, t3);
atomic_inc(&t->cj->nr_force);
/* Now, build all the dependencies for the hydro for the cells */
@@ -1700,9 +1700,9 @@ void engine_make_extra_hydroloop_tasks(struct engine *e) {
t->flags, 0, t->ci, t->cj, 0);
/* Add the link between the new loop and the cell */
- t->ci->gradient = engine_addlink(e, t->ci->gradient, t2);
+ engine_addlink(e, &t->ci->gradient, t2);
atomic_inc(&t->ci->nr_gradient);
- t->ci->force = engine_addlink(e, t->ci->force, t3);
+ engine_addlink(e, &t->ci->force, t3);
atomic_inc(&t->ci->nr_force);
/* Now, build all the dependencies for the hydro for the cells */
@@ -1744,13 +1744,13 @@ void engine_make_extra_hydroloop_tasks(struct engine *e) {
t->flags, 0, t->ci, t->cj, 0);
/* Add the link between the new loop and both cells */
- t->ci->gradient = engine_addlink(e, t->ci->gradient, t2);
+ engine_addlink(e, &t->ci->gradient, t2);
atomic_inc(&t->ci->nr_gradient);
- t->cj->gradient = engine_addlink(e, t->cj->gradient, t2);
+ engine_addlink(e, &t->cj->gradient, t2);
atomic_inc(&t->cj->nr_gradient);
- t->ci->force = engine_addlink(e, t->ci->force, t3);
+ engine_addlink(e, &t->ci->force, t3);
atomic_inc(&t->ci->nr_force);
- t->cj->force = engine_addlink(e, t->cj->force, t3);
+ engine_addlink(e, &t->cj->force, t3);
atomic_inc(&t->cj->nr_force);
/* Now, build all the dependencies for the hydro for the cells */
--
GitLab