X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c443073b95d1c38c3333b595833d34f6b0e1c6d2..7b1fb02d6a252c499432b7c90e2d08d5da05b66e:/src/surf/network_ib.cpp

diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp
index 98ee6c599a..4e51c2b2df 100644
--- a/src/surf/network_ib.cpp
+++ b/src/surf/network_ib.cpp
@@ -4,6 +4,9 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include <algorithm>
+#include <utility>
+
 #include "network_ib.hpp"
 #include "simgrid/sg_config.h"
 #include "maxmin_private.hpp"
@@ -53,7 +56,7 @@ static void IB_action_init_callback(NetworkAction *action,RoutingEdge *src, Rout
     xbt_die("could not find dst node active comms !");  
  // act_dst->rate=rate;
   
-  ((NetworkIBModel*)surf_network_model)->active_comms[action]=make_pair(act_src, act_dst);
+  ((NetworkIBModel*)surf_network_model)->active_comms[action]=std::make_pair(act_src, act_dst);
   //post the action in the second dist, to retrieve in the other callback
   XBT_DEBUG("IB callback - action %p init", action);
 
@@ -136,7 +139,7 @@ void NetworkIBModel::computeIBfactors(IBNode *root) {
 	my_penalty_out = num_comm_out * Bs;
     }
 
-    max_penalty_out = max(max_penalty_out,my_penalty_out);
+    max_penalty_out = std::max(max_penalty_out,my_penalty_out);
   }
 
   for (std::vector<ActiveComm*>::iterator it= root->ActiveCommsUp.begin(); it != root->ActiveCommsUp.end(); ++it) {
@@ -149,7 +152,7 @@ void NetworkIBModel::computeIBfactors(IBNode *root) {
 		      * Be 
 		      * (*it)->destination->ActiveCommsDown.size();//number of different nodes sending to dest
     
-    double penalty=max(my_penalty_in,max_penalty_out);
+    double penalty = std::max(my_penalty_in,max_penalty_out);
     
     double rate_before_update = (*it)->action->getBound();
     //save initial rate of the action