From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 6 Dec 2011 14:42:01 +0000 (+0100)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: exp_20120216~241
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f365d61a634d854a3244979c0524de3cf3a74f72

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
---

f365d61a634d854a3244979c0524de3cf3a74f72
diff --cc examples/msg/properties/msg_prop.c
index 34890710f5,5b36d02b2b..051ba16380
--- a/examples/msg/properties/msg_prop.c
+++ b/examples/msg/properties/msg_prop.c
@@@ -51,10 -50,10 +51,10 @@@ static void test_host(const char*hostna
    XBT_INFO("   Property: %s old value: %s", exist, value);
  
    XBT_INFO("== Trying to modify a host property");
-   xbt_dict_set(props, exist, xbt_strdup("250"), xbt_free_f);
+   xbt_dict_set(props, exist, xbt_strdup("250"), NULL);
  
    /* Test if we have changed the value */
 -  value = MSG_host_get_property_value(host1, exist);
 +  value = MSG_host_get_property_value(thehost, exist);
    xbt_assert(value, "Property %s is undefined (where it should)", exist);
    xbt_assert(!strcmp(value, "250"),
                "Value of property %s is defined to %s (where it should be 250)",