Merge with master and fix conflicts

[simgrid.git] / 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 237c7b1..992f70d 100644 (file)
--- a/src/include/surf/surf_resource_lmm.h
+++ b/src/include/surf/surf_resource_lmm.h
@@ -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)