Update copyright notices

[simgrid.git] / src / surf / network_smpi.cpp

diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp
index 68174da..78e03e5 100644 (file)
--- a/src/surf/network_smpi.cpp
+++ b/src/surf/network_smpi.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -80,7 +80,6 @@ void surf_network_model_init_SMPI(void)
   surf_network_model = new NetworkSmpiModel();
   net_define_callbacks();
   xbt_dynar_push(model_list, &surf_network_model);
-  //network_solve = lmm_solve;
 
   xbt_cfg_setdefault_double(_sg_cfg_set, "network/sender_gap", 10e-6);
   xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
@@ -105,12 +104,10 @@ NetworkSmpiModel::~NetworkSmpiModel(){
   }
 }
 
-void NetworkSmpiModel::gapAppend(double size, const NetworkLinkPtr link, NetworkActionPtr action)
+void NetworkSmpiModel::gapAppend(double size, Link* link, NetworkAction *action)
 {
   const char *src = link->getName();
   xbt_fifo_t fifo;
-  //surf_action_network_CM02_t last_action;
-  //double bw;
 
   if (sg_sender_gap > 0.0) {
     if (!gap_lookup) {
@@ -142,11 +139,11 @@ void NetworkSmpiModel::gapAppend(double size, const NetworkLinkPtr link, Network
   }
 }
 
-void NetworkSmpiModel::gapRemove(ActionPtr lmm_action)
+void NetworkSmpiModel::gapRemove(Action *lmm_action)
 {
   xbt_fifo_t fifo;
   size_t size;
-  NetworkCm02ActionPtr action = static_cast<NetworkCm02ActionPtr>(lmm_action);
+  NetworkCm02Action *action = static_cast<NetworkCm02Action*>(lmm_action);
 
   if (sg_sender_gap > 0.0 && action->p_senderLinkName
       && action->p_senderFifoItem) {