[mc] Move the stack as field of SafetyChecker and CommDetChecker

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

diff --git a/src/surf/AsImpl.hpp b/src/surf/AsImpl.hpp
index b77bac6..527d0dc 100644 (file)
--- a/src/surf/AsImpl.hpp
+++ b/src/surf/AsImpl.hpp
@@ -6,13 +6,10 @@
 #ifndef SIMGRID_SURF_AS_HPP
 #define SIMGRID_SURF_AS_HPP
 
-#include "xbt/base.h"
 #include "xbt/graph.h"
 
 #include "simgrid/s4u/forward.hpp"
 #include "simgrid/s4u/As.hpp"
-#include <vector>
-#include <map>
 
 #include "src/surf/xml/platf_private.hpp" // FIXME: kill sg_platf_route_cbarg_t to remove that UGLY include
 
@@ -67,14 +64,13 @@ public:
   static void getRouteRecursive(surf::NetCard *src, surf::NetCard *dst, /* OUT */ std::vector<surf::Link*> * links, double *latency);
 
 
-  enum RoutingKind {
-    ROUTING_NULL = 0,   /**< Undefined type                                   */
-    ROUTING_BASE,       /**< Base case: use simple link lists for routing     */
-    ROUTING_RECURSIVE   /**< Recursive case: also return gateway informations */
+  enum class RoutingMode {
+    unset = 0,  /**< Undefined type                                   */
+    base,       /**< Base case: use simple link lists for routing     */
+    recursive   /**< Recursive case: also return gateway informations */
   };
   /* FIXME: protect the following fields once the construction madness is sorted out */
-  RoutingKind hierarchy_ = ROUTING_NULL;
-  xbt_dynar_t upDownLinks = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
+  RoutingMode hierarchy_ = RoutingMode::unset;
   surf::NetCard *netcard_ = nullptr; // Our representative in the father AS
 };