AS->Zone + stringification

[simgrid.git] / src / kernel / routing / FatTreeZone.hpp

diff --git a/src/kernel/routing/FatTreeZone.hpp b/src/kernel/routing/FatTreeZone.hpp
index 8d85387..e24867f 100644 (file)
--- a/src/kernel/routing/FatTreeZone.hpp
+++ b/src/kernel/routing/FatTreeZone.hpp
@@ -46,11 +46,11 @@ public:
 
   /** Virtual link standing for the node global capacity.
    */
-  Link* limiterLink;
+  surf::LinkImpl* limiterLink;
   /** If present, communications from this node to this node will pass through it
    * instead of passing by an upper level switch.
    */
-  Link* loopback;
+  surf::LinkImpl* loopback;
   FatTreeNode(sg_platf_cluster_cbarg_t cluster, int id, int level, int position);
 };
 
@@ -63,9 +63,9 @@ class FatTreeLink {
 public:
   FatTreeLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode* source, FatTreeNode* destination);
   /** Link going up in the tree */
-  Link* upLink;
+  surf::LinkImpl* upLink;
   /** Link going down in the tree */
-  Link* downLink;
+  surf::LinkImpl* downLink;
   /** Upper end of the link */
   FatTreeNode* upNode;
   /** Lower end of the link */
@@ -98,7 +98,7 @@ public:
  */
 class XBT_PRIVATE FatTreeZone : public ClusterZone {
 public:
-  explicit FatTreeZone(NetZone* father, const char* name);
+  explicit FatTreeZone(NetZone* father, std::string name);
   ~FatTreeZone() override;
   void getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t into, double* latency) override;
 
@@ -119,7 +119,7 @@ public:
 
 private:
   // description of a PGFT (TODO : better doc)
-  unsigned int levels_ = 0;
+  unsigned long levels_ = 0;
   std::vector<unsigned int> lowerLevelNodesNumber_; // number of children by node
   std::vector<unsigned int> upperLevelNodesNumber_; // number of parents by node
   std::vector<unsigned int> lowerLevelPortsNumber_; // ports between each level l and l-1