From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 9 Oct 2018 23:31:38 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_22~917
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fcfc285a211242ff365a365ffdcd3fab0f426a29?hp=-c

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

fcfc285a211242ff365a365ffdcd3fab0f426a29
diff --combined include/simgrid/msg.h
index 515b066c12,2abf905374..1092890a09
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@@ -119,10 -119,6 +119,6 @@@ XBT_PUBLIC sg_host_t MSG_host_self()
  /* ******************************** VMs ************************************* */
  typedef sg_vm_t msg_vm_t;
  
- XBT_ATTRIB_DEPRECATED_v322("Use sg_vm_create_migratable() from the live migration plugin: "
-                            "v3.22 will drop MSG_vm_create() completely.") XBT_PUBLIC sg_vm_t
-     MSG_vm_create(sg_host_t ind_pm, const char* name, int coreAmount, int ramsize, int mig_netspeed, int dp_intensity);
- 
  XBT_PUBLIC msg_vm_t MSG_vm_create_core(msg_host_t pm, const char* name);
  XBT_PUBLIC msg_vm_t MSG_vm_create_multicore(msg_host_t pm, const char* name, int coreAmount);
  
@@@ -241,6 -237,8 +237,6 @@@ typedef struct msg_task* msg_task_t
  #define MSG_TASK_UNINITIALIZED NULL
  
  /** @brief Return code of most MSG functions
 -    @ingroup msg_simulation
 -    @{ */
  /* Keep these code as binary values: java bindings manipulate | of these values */
  typedef enum {
    MSG_OK = 0,                 /**< @brief Everything is right. Keep on going this way ! */
@@@ -253,6 -251,7 +249,6 @@@
        return now !*/
    MSG_TASK_CANCELED = 8      /**< @brief Canceled task. This task has been canceled by somebody!*/
  } msg_error_t;
 -/** @} */
  
  /************************** Global ******************************************/
  /** @brief set a configuration variable