Last bits of convertion from xbt_error_t to exceptions. Some more cleanups (mainly...

[simgrid.git] / include / xbt / dict.h

diff --git a/include/xbt/dict.h b/include/xbt/dict.h
index d708a71..395f53e 100644 (file)
--- a/include/xbt/dict.h
+++ b/include/xbt/dict.h
@@ -13,7 +13,6 @@
 
 #include "xbt/misc.h" /* BEGIN_DECL */
 #include "xbt/dynar.h" /* void_f_pvoid_t */
-#include "xbt/error.h"
 
 BEGIN_DECL()
 
@@ -65,7 +64,7 @@ BEGIN_DECL()
   void *xbt_dict_get(xbt_dict_t head,const char *key);
   void *xbt_dict_get_or_null(xbt_dict_t dict, const char *key);
 
-  xbt_error_t xbt_dict_remove(xbt_dict_t head, const char *key);
+  void xbt_dict_remove(xbt_dict_t head, const char *key);
   void xbt_dict_dump(xbt_dict_t head,void (*output)(void*));
   
 /** @} */
@@ -80,8 +79,7 @@ BEGIN_DECL()
                         void           *data,
                         void_f_pvoid_t *free_ctn);
   void *xbt_dict_get_ext(xbt_dict_t head,const char *key, int key_len);
-  xbt_error_t xbt_dict_remove_ext(xbt_dict_t head,
-                                 const char *key, int key_len);
+  void xbt_dict_remove_ext(xbt_dict_t head, const char *key, int key_len);
 
 
 /** @} */
@@ -164,11 +162,8 @@ void *xbt_multidict_get_ext(xbt_dict_t mdict, xbt_dynar_t keys, xbt_dynar_t lens
 
 /*----[ xbt_multidict_remove ]-----------------------------------------------*/
 /*---------------------------------------------------------------------------*/
-xbt_error_t 
-xbt_multidict_remove(xbt_dict_t mdict, xbt_dynar_t keys);
-xbt_error_t 
-xbt_multidict_remove_ext(xbt_dict_t mdict, 
-                         xbt_dynar_t keys, xbt_dynar_t lens);
+void xbt_multidict_remove(xbt_dict_t mdict, xbt_dynar_t keys);
+void xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys, xbt_dynar_t lens);
 
 /** @} */
 /** @} */