Move simgrid::surf::Link declaration with its friends in forward.h

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 1875ce9..a0b8ded 100644 (file)
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -17,6 +17,7 @@ namespace surf {
 class Cpu;
 class RoutingEdge;
 class As;
 class Cpu;
 class RoutingEdge;
 class As;

+class Link;

 
 }
 }
 
 }
 }


@@ -24,12 +25,14 @@ class As;
 typedef simgrid::surf::Cpu surf_Cpu;
 typedef simgrid::surf::RoutingEdge surf_RoutingEdge;
 typedef simgrid::surf::As surf_As;
 typedef simgrid::surf::Cpu surf_Cpu;
 typedef simgrid::surf::RoutingEdge surf_RoutingEdge;
 typedef simgrid::surf::As surf_As;

+typedef simgrid::surf::Link Link;

 
 #else
 
 typedef struct surf_Cpu surf_Cpu;
 typedef struct surf_RoutingEdge surf_RoutingEdge;
 typedef struct surf_As surf_As;
 
 #else
 
 typedef struct surf_Cpu surf_Cpu;
 typedef struct surf_RoutingEdge surf_RoutingEdge;
 typedef struct surf_As surf_As;

+typedef struct Link Link;

 
 #endif
 
 
 #endif
 

diff --git a/include/simgrid/link.h b/include/simgrid/link.h
index 538d378..322d8b1 100644 (file)
--- a/include/simgrid/link.h
+++ b/include/simgrid/link.h
@@ -9,23 +9,7 @@
 #ifndef INCLUDE_SIMGRID_LINK_H_
 #define INCLUDE_SIMGRID_LINK_H_
 
 #ifndef INCLUDE_SIMGRID_LINK_H_
 #define INCLUDE_SIMGRID_LINK_H_
 

-
-#ifdef __cplusplus
-
-namespace simgrid {
-namespace surf {
-
-class Link;
-
-}
-}
-typedef simgrid::surf::Link Link;
-
-#else
-typedef struct Link Link;
-#endif
-
-
+#include <simgrid/forward.h>

 
 /* C interface */
 SG_BEGIN_DECL()
 
 /* C interface */
 SG_BEGIN_DECL()