Kill useless typedefs routing_NetPoint and sg_netpoint_t.

[simgrid.git] / src / surf / xml / platf_private.hpp

diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp
index 895291d..2004447 100644 (file)
--- a/src/surf/xml/platf_private.hpp
+++ b/src/surf/xml/platf_private.hpp
@@ -11,6 +11,7 @@
 
 #include "simgrid/host.h"
 #include "src/surf/xml/platf.hpp"
+#include "src/surf/xml/simgrid_dtd.h"
 #include <map>
 #include <string>
 #include <vector>
@@ -72,11 +73,11 @@ public:
 
 class RouteCreationArgs {
 public:
-  bool symmetrical     = false;
-  sg_netpoint_t src    = nullptr;
-  sg_netpoint_t dst    = nullptr;
-  sg_netpoint_t gw_src = nullptr;
-  sg_netpoint_t gw_dst = nullptr;
+  bool symmetrical = false;
+  NetPoint* src    = nullptr;
+  NetPoint* dst    = nullptr;
+  NetPoint* gw_src = nullptr;
+  NetPoint* gw_dst = nullptr;
   std::vector<simgrid::surf::LinkImpl*> link_list;
 };
 
@@ -179,12 +180,6 @@ public:
 }}}
 
 extern "C" {
-#include "src/surf/xml/simgrid_dtd.h"
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
 
 /********** Routing **********/
 void routing_cluster_add_backbone(simgrid::surf::LinkImpl* bb);