Cosmetics: rename message types, INFO -> CTRL, and LOAD -> DATA.

[loba.git] / deployment.cpp

diff --git a/deployment.cpp b/deployment.cpp
index 705c1ea859539b528810cad95040ac55c9789ca2..8f52806bb15fc591f28b6c5c6215466fb4770627 100644 (file)
--- a/deployment.cpp
+++ b/deployment.cpp
@@ -1,6 +1,6 @@
 #include <algorithm>
 #include <cstdlib>
 #include <algorithm>
 #include <cstdlib>

-#include <tr1/functional>
+#include <functional>

 #include <iomanip>
 #include <numeric>
 #include <sstream>
 #include <iomanip>
 #include <numeric>
 #include <sstream>


@@ -50,8 +50,7 @@ void deployment_generator::set_link(int host1, int host2)
 
 void deployment_generator::distribute_load()
 {
 
 void deployment_generator::distribute_load()
 {

-    using std::tr1::bind;
-    using std::tr1::placeholders::_1;
+    using std::placeholders::_1;

 
     if (!opt::auto_depl::random_distribution) {
         set_load(0, opt::auto_depl::load);
 
     if (!opt::auto_depl::random_distribution) {
         set_load(0, opt::auto_depl::load);


@@ -63,7 +62,7 @@ void deployment_generator::distribute_load()
     double factor = opt::auto_depl::load /
         std::accumulate(loads.begin(), loads.end(), 0.0);
     std::transform(loads.begin(), loads.end(), loads.begin(),
     double factor = opt::auto_depl::load /
         std::accumulate(loads.begin(), loads.end(), 0.0);
     std::transform(loads.begin(), loads.end(), loads.begin(),

-                   bind(std::multiplies<double>(), _1, factor));
+                   std::bind(std::multiplies<double>(), _1, factor));

     for (unsigned i = 0 ; i < hosts.size() ; ++i)
         set_load(i, loads[i]);
 }
     for (unsigned i = 0 ; i < hosts.size() ; ++i)
         set_load(i, loads[i]);
 }