X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/54e35ebda7e4ffacd769653b8ebb8ba93c7298bf..f01580e0ccb84c36906cb6be929b5c9b784c1cc1:/src/surf/surf_routing_cluster_torus.hpp

diff --git a/src/surf/surf_routing_cluster_torus.hpp b/src/surf/surf_routing_cluster_torus.hpp
index a9ab7942c4..ecb674e570 100644
--- a/src/surf/surf_routing_cluster_torus.hpp
+++ b/src/surf/surf_routing_cluster_torus.hpp
@@ -1,29 +1,32 @@
-/* Copyright (c) 2014. The SimGrid Team.
+/* Copyright (c) 2014-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* 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 "surf_routing_none.hpp"
-#include "network_interface.hpp"
-#include "surf_routing_cluster.hpp"
-
 
 #ifndef SURF_ROUTING_CLUSTER_TORUS_HPP_
 #define SURF_ROUTING_CLUSTER_TORUS_HPP_
 
-class AsClusterTorus: public AsCluster {
-public:
-   AsClusterTorus();
-   virtual ~AsClusterTorus();
-   virtual void create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position);
-   virtual void getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_route_cbarg_t into, double *latency);
-   void parse_specific_arguments(sg_platf_cluster_cbarg_t cluster);
-
-
-   xbt_dynar_t p_dimensions;
-
-};
+#include <xbt/base.h>
 
+#include "surf_routing_none.hpp"
+#include "network_interface.hpp"
+#include "surf_routing_cluster.hpp"
 
+namespace simgrid {
+  namespace surf {
+
+    class XBT_PRIVATE AsClusterTorus:public simgrid::surf::AsCluster {
+    public:
+      AsClusterTorus(const char*name);
+      virtual ~AsClusterTorus();
+      void create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position) override;
+      void getRouteAndLatency(NetCard * src, NetCard * dst, sg_platf_route_cbarg_t into, double *latency) override;
+      void parse_specific_arguments(sg_platf_cluster_cbarg_t cluster) override;
+    private:
+      xbt_dynar_t dimensions_ = NULL;
+    };
+
+  }}
 #endif