Skip to content
Snippets Groups Projects
Commit ffce8e69 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Corrected merge bug in scheduler_done()

parent f7434dc2
No related branches found
No related tags found
2 merge requests!136Master,!79First version of the multiple time-stepping
...@@ -1134,10 +1134,6 @@ void scheduler_enqueue(struct scheduler *s, struct task *t) { ...@@ -1134,10 +1134,6 @@ void scheduler_enqueue(struct scheduler *s, struct task *t) {
struct task *scheduler_done(struct scheduler *s, struct task *t) { struct task *scheduler_done(struct scheduler *s, struct task *t) {
int k, res;
struct task *t2, *next = NULL;
struct cell *super = t->ci->super;
/* Release whatever locks this task held. */ /* Release whatever locks this task held. */
if (!t->implicit) task_unlock(t); if (!t->implicit) task_unlock(t);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment