From 300b2bf15550101e3f2c136f3472fa89d2e00b23 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 21 Feb 2012 16:50:01 +0100 Subject: [PATCH] Try to avoid to mix enum with anything else. --- src/include/surf/surf_resource_lmm.h | 2 +- src/surf/network.c | 2 +- src/xbt/config.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/include/surf/surf_resource_lmm.h b/src/include/surf/surf_resource_lmm.h index 4f7eb940f0..992f70db07 100644 --- a/src/include/surf/surf_resource_lmm.h +++ b/src/include/surf/surf_resource_lmm.h @@ -20,7 +20,7 @@ static XBT_INLINE 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) diff --git a/src/surf/network.c b/src/surf/network.c index 0da4bbfe07..af6e1ed707 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -80,7 +80,7 @@ static void heap_insert(surf_action_network_CM02_t action, double key, enum h } static void heap_remove(surf_action_network_CM02_t action){ - action->hat = NONE; + action->hat = NOTSET; if(((surf_action_network_CM02_t) action)->index_heap >= 0){ xbt_heap_remove(net_action_heap,action->index_heap); } diff --git a/src/xbt/config.c b/src/xbt/config.c index 39b4262834..23b3dfc4fa 100644 --- a/src/xbt/config.c +++ b/src/xbt/config.c @@ -326,7 +326,7 @@ void xbt_cfg_register_str(xbt_cfg_t * cfg, const char *entry) "; Should be :_to__"); tok++; - for (type = 0; + for (type = (e_xbt_cfgelm_type_t)0; type < xbt_cfgelm_type_count && strcmp(tok, xbt_cfgelm_type_name[type]); type++); xbt_assert(type < xbt_cfgelm_type_count, @@ -509,7 +509,7 @@ void xbt_cfg_set_vargs(xbt_cfg_t cfg, const char *name, va_list pa) char *str; int i; double d; - e_xbt_cfgelm_type_t type = 0; /* Set a dummy value to make gcc happy. It cannot get uninitialized */ + e_xbt_cfgelm_type_t type = xbt_cfgelm_any; /* Set a dummy value to make gcc happy. It cannot get uninitialized */ xbt_ex_t e; -- 2.20.1