Merge branch 'condvar'

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

diff --git a/src/surf/AsRoutedGraph.hpp b/src/surf/AsRoutedGraph.hpp
index 4079e8f..c5fb0ad 100644 (file)
--- a/src/surf/AsRoutedGraph.hpp
+++ b/src/surf/AsRoutedGraph.hpp
@@ -3,22 +3,22 @@
 /* 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. */
 
-#ifndef SURF_ROUTING_GENERIC_HPP_
-#define SURF_ROUTING_GENERIC_HPP_
+#ifndef SIMGRID_ROUTING_GENERIC_HPP_
+#define SIMGRID_ROUTING_GENERIC_HPP_
 
 #include "src/surf/AsImpl.hpp"
 
 namespace simgrid {
-namespace surf {
+namespace routing {
 
 class XBT_PRIVATE AsRoutedGraph : public AsImpl {
 public:
-  AsRoutedGraph(const char*name);
-  ~AsRoutedGraph();
+  explicit AsRoutedGraph(const char*name);
+  ~AsRoutedGraph() override;
 
   xbt_dynar_t getOneLinkRoutes() override;
 
-  virtual void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) override;
+  void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) override;
   virtual sg_platf_route_cbarg_t newExtendedRoute(RoutingMode hierarchy, sg_platf_route_cbarg_t routearg, int change_order);
 protected:
   void getRouteCheckParams(NetCard *src, NetCard *dst);
@@ -28,4 +28,4 @@ protected:
 }
 }
 
-#endif /* SURF_ROUTING_GENERIC_HPP_ */
+#endif /* SIMGRID_ROUTING_GENERIC_HPP_ */