From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Thu, 10 Dec 2015 15:20:45 +0000 (+0100)
Subject: Move simgrid::surf::Link declaration with its friends in forward.h
X-Git-Tag: v3_13~1467
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c1201ace6e2b37d3729b801cfaa14e8c498761e5?ds=sidebyside

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

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 1875ce9329..a0b8ded37e 100644
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -17,6 +17,7 @@ namespace surf {
 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::Link Link;
 
 #else
 
 typedef struct surf_Cpu surf_Cpu;
 typedef struct surf_RoutingEdge surf_RoutingEdge;
 typedef struct surf_As surf_As;
+typedef struct Link Link;
 
 #endif
 
diff --git a/include/simgrid/link.h b/include/simgrid/link.h
index 538d3783a9..322d8b1f0f 100644
--- a/include/simgrid/link.h
+++ b/include/simgrid/link.h
@@ -9,23 +9,7 @@
 #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()