X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/300b2bf15550101e3f2c136f3472fa89d2e00b23..4b2b01eff3a1b860aed60642848a6e1000011c22:/src/include/surf/surf_resource_lmm.h diff --git a/src/include/surf/surf_resource_lmm.h b/src/include/surf/surf_resource_lmm.h index 992f70db07..b0d7e33df7 100644 --- a/src/include/surf/surf_resource_lmm.h +++ b/src/include/surf/surf_resource_lmm.h @@ -1,5 +1,5 @@ -/* Copyright (c) 2009, 2010. The SimGrid Team. +/* Copyright (c) 2009-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -11,7 +11,7 @@ #include "surf/trace_mgr.h" #include "surf/surf_resource.h" - +#ifdef TOMATO static XBT_INLINE surf_resource_lmm_t surf_resource_lmm_new(size_t childsize, /* for superclass */ @@ -28,7 +28,7 @@ static XBT_INLINE surf_resource_lmm_t res = (surf_resource_lmm_t) surf_resource_new(childsize, model, name, - props); + props, NULL); res->constraint = lmm_constraint_new(system, res, constraint_value); res->state_current = state_init; @@ -43,7 +43,7 @@ static XBT_INLINE tmgr_history_add_trace(history, metric_trace, 0.0, 0, res); return res; } - +#endif static XBT_INLINE e_surf_resource_state_t surf_resource_lmm_get_state(void *r)