X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..bdfe4f8674f98efbf2d67ad854ef83a1d5f855ed:/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 237c7b1bfd..44bfeaf447 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-2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -9,16 +9,18 @@ #define SURF_RESOURCE_LMM_H #include "surf/surf.h" #include "surf/trace_mgr.h" +#include "surf/surf_resource.h" + static XBT_INLINE surf_resource_lmm_t surf_resource_lmm_new(size_t childsize, /* for superclass */ surf_model_t model, - char *name, xbt_dict_t props, + const char *name, xbt_dict_t props, lmm_system_t system, double constraint_value, tmgr_history_t history, - int state_init, + e_surf_resource_state_t state_init, tmgr_trace_t state_trace, double metric_peak, tmgr_trace_t metric_trace) @@ -26,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;