Merge pull request #1 from mquinson/master

[simgrid.git] / src / surf / surf_routing_dijkstra.hpp

diff --git a/src/surf/surf_routing_dijkstra.hpp b/src/surf/surf_routing_dijkstra.hpp
index aa84000..a5ef07e 100644 (file)
--- a/src/surf/surf_routing_dijkstra.hpp
+++ b/src/surf/surf_routing_dijkstra.hpp
@@ -25,15 +25,19 @@ typedef struct route_cache_element {
   int size;
 } s_route_cache_element_t, *route_cache_element_t;
 
+namespace simgrid {
+namespace surf {
+
 /***********
  * Classes *
  ***********/
+
 class XBT_PRIVATE AsDijkstra;
 
 class AsDijkstra : public AsGeneric {
 public:
   AsDijkstra();
-  AsDijkstra(int cached);
+  AsDijkstra(bool cached);
   ~AsDijkstra();
        xbt_node_t routeGraphNewNode(int id, int graph_id);
        graph_node_map_element_t nodeMapSearch(int id);
@@ -51,17 +55,20 @@ public:
      * will have a loopback attached to it.
      */
        void addLoopback();
-       void getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_route_cbarg_t route, double *lat);
-       xbt_dynar_t getOnelinkRoutes();
-       void getRouteAndLatency(sg_platf_route_cbarg_t route, double *lat);
-       void parseASroute(sg_platf_route_cbarg_t route);
-       void parseRoute(sg_platf_route_cbarg_t route);
+       void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat) override;
+       xbt_dynar_t getOneLinkRoutes() override;
+       void getRouteAndLatency(sg_platf_route_cbarg_t route, double *lat); // FIXME: this function is dangerously not overriding because of diverging prototype
+       void parseASroute(sg_platf_route_cbarg_t route) override;
+       void parseRoute(sg_platf_route_cbarg_t route) override;
        void end();
 
-  xbt_graph_t p_routeGraph;      /* xbt_graph */
-  xbt_dict_t p_graphNodeMap;    /* map */
-  xbt_dict_t p_routeCache;       /* use in cache mode */
-  int m_cached;
+  xbt_graph_t p_routeGraph = nullptr;      /* xbt_graph */
+  xbt_dict_t p_graphNodeMap = nullptr;    /* map */
+  xbt_dict_t p_routeCache = nullptr;       /* use in cache mode */
+  bool m_cached = false;
 };
 
+}
+}
+
 #endif /* SURF_ROUTING_DIJKSTRA_HPP_ */