src: always define driver.id.opencl_id

include/starpu_driver.h

@@ -52,7 +52,7 @@ struct starpu_driver
 		unsigned cuda_id;
 #if defined(STARPU_USE_OPENCL) && !defined(__CUDACC__)
 		cl_device_id opencl_id;
-#elif defined(STARPU_SIMGRID)
+#else
 		unsigned opencl_id;
 #endif
 	} id;

src/core/workers.c

@@ -486,12 +486,10 @@ static unsigned _starpu_may_launch_driver(struct starpu_conf *conf,
 			if (d->id.cuda_id == conf->not_launched_drivers[i].id.cuda_id)
 				return 0;
 			break;
-#ifdef STARPU_USE_OPENCL
 		case STARPU_OPENCL_WORKER:
 			if (d->id.opencl_id == conf->not_launched_drivers[i].id.opencl_id)
 				return 0;
 			break;
-#endif
 		default:
 			STARPU_ABORT();
 		}
@@ -567,7 +565,6 @@ void _starpu_worker_init(struct _starpu_worker *workerarg, struct _starpu_machin
 
 	workerarg->spinning_backoff = 1;
 
-
 	for(ctx = 0; ctx < STARPU_NMAX_SCHED_CTXS; ctx++)
 	{
 		workerarg->shares_tasks_lists[ctx] = 0;