X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/97d3abf54943fe29eef37b8c639b736eafd7aa09..a3427ca7c9f8f2563bb982044e1082cc8f3cdd1e:/include/msg/datatypes.h

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index 0112cbdc7d..d6d9afb5a3 100644
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -9,10 +9,11 @@
 #define MSG_DATATYPE_H
 #include "xbt/misc.h"
 
-BEGIN_DECL()
+SG_BEGIN_DECL()
 
 /* ******************************** Host ************************************ */
-/** @defgroup m_datatypes_management_details */
+/** @defgroup m_datatypes_management_details Details on MSG datatypes
+    @ingroup  m_datatypes_management*/
 
 typedef struct simdata_host *simdata_host_t;
 /** @brief Host datatype 
@@ -118,38 +119,11 @@ typedef enum {
   MSG_HOST_FAILURE, /**< @brief System shutdown. The host on which you are
       running has just been rebooted. Free your datastructures and
       return now !*/
+  MSG_TASK_CANCELLED, /**< @brief Cancelled task. This task has been cancelled 
+			by somebody!*/
   MSG_FATAL /**< @brief You've done something wrong. You'd better look at it... */
 } MSG_error_t;
 /** @} */
 
-
-/** @deprecated MSG verbosity
-    @ingroup m_datatypes_management
-*/
-typedef enum {
-  MSG_SILENT = 0,
-  MSG_SOME,
-  MSG_VERBOSE
-} MSG_outputmode_t;
-
-
-/** @deprecated Network sharing mechanism
-    @ingroup m_datatypes_management
-    @brief Sharing policy : 0 means uninitialized value
-*/
-typedef enum {
-  MSG_STORE_AND_FORWARD = 1, /**<  Packet level simulation of communications. Bad */
-  MSG_TCP                    /**<  Continuous model of network communications. Good  */
-} MSG_sharing_t;
-
-/** @deprecated Link datatype  
- *  @ingroup m_datatypes_management
- *    The notion of <em>link</em> was present in the earliest versions of MSG.  
- *    It was an agglomeration of communicating resources representing a set of
- *    physical network links. This abstraction a disappeared because in real-life,
- *    it is generally not possible to interact directly with a link...
- */
-typedef struct m_link *m_link_t;
-
-END_DECL()
+SG_END_DECL()
 #endif