move the routing stuff to its namespace

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

diff --git a/src/surf/AsClusterDragonfly.cpp b/src/surf/AsClusterDragonfly.cpp
index bb3a90c..663da3a 100644 (file)
--- a/src/surf/AsClusterDragonfly.cpp
+++ b/src/surf/AsClusterDragonfly.cpp
@@ -14,12 +14,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster_dragonfly, surf_route_cluster
 
 
 
-
-
-
-
 namespace simgrid {
-namespace surf {
+namespace routing {
 
 AsClusterDragonfly::AsClusterDragonfly(const char*name)
   : AsCluster(name) {
@@ -28,7 +24,7 @@ AsClusterDragonfly::AsClusterDragonfly(const char*name)
 AsClusterDragonfly::~AsClusterDragonfly() {
 
   if(this->routers_!=NULL){
-    int i;
+    unsigned int i;
     for (i=0; i<this->numGroups_*this->numChassisPerGroup_*this->numBladesPerChassis_;i++)
         delete(routers_[i]);
     xbt_free(routers_);
@@ -175,12 +171,12 @@ void AsClusterDragonfly::createLink(char* id, int numlinks, Link** linkup, Link*
 
 void AsClusterDragonfly::generateLinks() {
 
-  unsigned int i, j, k, l,m;
+  unsigned int i, j, k, l;
   static int uniqueId = 0;
   char* id = NULL;
   Link* linkup, *linkdown;
 
-  int numRouters = this->numGroups_*this->numChassisPerGroup_*this->numBladesPerChassis_;
+  unsigned int numRouters = this->numGroups_*this->numChassisPerGroup_*this->numBladesPerChassis_;
 
   if (this->cluster_->sharing_policy == SURF_LINK_FULLDUPLEX)
     numLinksperLink_=2;