From 07090eeec7d73fbd00a9850fc86d361b7ac4ea54 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 29 May 2017 15:36:24 +0200
Subject: [PATCH] sort out a bit the forward declarations

---
 include/simgrid/forward.h       | 12 +-----------
 include/simgrid/s4u/forward.hpp |  7 ++++++-
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 9515436c61..ff78fe381a 100644
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -9,21 +9,11 @@
 
 #ifdef __cplusplus
 
+#include "s4u/forward.hpp"
 #include "xbt/base.h"
 #include <boost/intrusive_ptr.hpp>
 
 namespace simgrid {
-namespace s4u {
-class Actor;
-class Comm;
-class Host;
-class Link;
-class Mailbox;
-class NetZone;
-
-XBT_PUBLIC(void) intrusive_ptr_release(Comm* c);
-XBT_PUBLIC(void) intrusive_ptr_add_ref(Comm* c);
-}
 namespace kernel {
 namespace activity {
 class ActivityImpl;
diff --git a/include/simgrid/s4u/forward.hpp b/include/simgrid/s4u/forward.hpp
index 10c8d856bb..cc29359308 100644
--- a/include/simgrid/s4u/forward.hpp
+++ b/include/simgrid/s4u/forward.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2016-2017. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -7,6 +7,7 @@
 #define SIMGRID_S4U_FORWARD_HPP
 
 #include <boost/intrusive_ptr.hpp>
+#include <xbt/base.h>
 
 namespace simgrid {
 namespace s4u {
@@ -19,12 +20,16 @@ class Comm;
 using CommPtr = boost::intrusive_ptr<Comm>;
 class Engine;
 class Host;
+class Link;
 class Mailbox;
 using MailboxPtr = boost::intrusive_ptr<Mailbox>;
 class Mutex;
+class NetZone;
 
 class Storage;
 
+XBT_PUBLIC(void) intrusive_ptr_release(Comm* c);
+XBT_PUBLIC(void) intrusive_ptr_add_ref(Comm* c);
 }
 }
 
-- 
2.20.1