Adrien Fix conflict

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

diff --git a/include/xbt/str.h b/include/xbt/str.h
index 39ecbd69e29e800583b5671d25a9287ff0defc09..fb2bc397b3f5a5cf53745a50361cd6adcc19842a 100644 (file)
--- a/include/xbt/str.h
+++ b/include/xbt/str.h
@@ -134,12 +134,6 @@ static XBT_INLINE unsigned int xbt_str_hash(const char *str)
   return hash;
 }
                                                       
-/** @brief Classical alias to (char*)
- *
- * This of almost no use, beside cosmetics and the XBT datadesc parsing macro (see \ref XBT_dd_auto).
- */
-typedef char *xbt_string_t;
-
 /**@}*/
 
 SG_END_DECL()