From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Sat, 11 Apr 2009 16:40:13 +0000 (+0000)
Subject: make sure that the gras_userdata_new() macro returns what just got malloced
X-Git-Tag: v3.3~17
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f45bc68e17a95c4277dbe63aaef98dda61536153

make sure that the gras_userdata_new() macro returns what just got malloced


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6229 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/include/gras/process.h b/include/gras/process.h
index 00d1635831..ac160ed1d7 100644
--- a/include/gras/process.h
+++ b/include/gras/process.h
@@ -61,7 +61,7 @@ XBT_PUBLIC(void) gras_userdata_set(void *ud);
  *
  * You'll find an example in the tutorial:  \ref GRAS_tut_tour_globals
  */
-#define gras_userdata_new(type) (gras_userdata_set(xbt_new0(type,1)),gras_userdata_get())
+#define gras_userdata_new(type) ((type*)gras_userdata_set(xbt_new0(type,1)),gras_userdata_get())
 /* @} */
 
 SG_END_DECL()
diff --git a/src/gras/Virtu/process.c b/src/gras/Virtu/process.c
index 1cea719991..385dfecbbc 100644
--- a/src/gras/Virtu/process.c
+++ b/src/gras/Virtu/process.c
@@ -65,10 +65,11 @@ void *gras_userdata_get(void) {
   return pd->userdata;
 }
 
-void gras_userdata_set(void *ud) {
+void* gras_userdata_set(void *ud) {
   gras_procdata_t *pd=gras_procdata_get();
 
   pd->userdata = ud;
+  return ud;
 }
 
 void *gras_libdata_by_name(const char *name) {