inline s4u/forward.hpp to its only include location

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 5fbff21..f45e35e 100644 (file)
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -6,11 +6,44 @@
 #ifndef SIMGRID_TYPES_H
 #define SIMGRID_TYPES_H
 
+#include <xbt/base.h>
+
 #ifdef __cplusplus
 
-#include <simgrid/s4u/forward.hpp>
+#include <boost/intrusive_ptr.hpp>
 
 namespace simgrid {
+
+namespace s4u {
+class Activity;
+class Actor;
+using ActorPtr = boost::intrusive_ptr<Actor>;
+XBT_PUBLIC void intrusive_ptr_release(Actor* actor);
+XBT_PUBLIC void intrusive_ptr_add_ref(Actor* actor);
+class Comm;
+using CommPtr = boost::intrusive_ptr<Comm>;
+XBT_PUBLIC void intrusive_ptr_release(Comm* c);
+XBT_PUBLIC void intrusive_ptr_add_ref(Comm* c);
+class Engine;
+class Exec;
+using ExecPtr = boost::intrusive_ptr<Exec>;
+XBT_PUBLIC void intrusive_ptr_release(Exec* e);
+XBT_PUBLIC void intrusive_ptr_add_ref(Exec* e);
+class Host;
+class Link;
+class Mailbox;
+using MailboxPtr = boost::intrusive_ptr<Mailbox>;
+XBT_PUBLIC void intrusive_ptr_release(Mailbox* m);
+XBT_PUBLIC void intrusive_ptr_add_ref(Mailbox* m);
+class Mutex;
+XBT_PUBLIC void intrusive_ptr_release(Mutex* m);
+XBT_PUBLIC void intrusive_ptr_add_ref(Mutex* m);
+class NetZone;
+class VirtualMachine;
+class File;
+class Storage;
+} // namespace s4u
+
 namespace config {
 template <class T> class Flag;
 }
@@ -21,6 +54,7 @@ namespace actor {
 class ActorImpl;
 using ActorImplPtr = boost::intrusive_ptr<ActorImpl>;
 } // namespace actor
+
 namespace activity {
   class ActivityImpl;
   using ActivityImplPtr = boost::intrusive_ptr<ActivityImpl>;

diff --git a/include/simgrid/s4u/forward.hpp b/include/simgrid/s4u/forward.hpp
deleted file mode 100644 (file)
index 627cb19..0000000
--- a/include/simgrid/s4u/forward.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright (c) 2016-2018. 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. */
-
-#ifndef SIMGRID_S4U_FORWARD_HPP
-#define SIMGRID_S4U_FORWARD_HPP
-
-#include <boost/intrusive_ptr.hpp>
-#include <xbt/base.h>
-
-namespace simgrid {
-namespace s4u {
-
-class Activity;
-class Actor;
-using ActorPtr = boost::intrusive_ptr<Actor>;
-XBT_PUBLIC void intrusive_ptr_release(Actor* actor);
-XBT_PUBLIC void intrusive_ptr_add_ref(Actor* actor);
-
-class Comm;
-using CommPtr = boost::intrusive_ptr<Comm>;
-XBT_PUBLIC void intrusive_ptr_release(Comm* c);
-XBT_PUBLIC void intrusive_ptr_add_ref(Comm* c);
-
-class Engine;
-class Exec;
-using ExecPtr = boost::intrusive_ptr<Exec>;
-XBT_PUBLIC void intrusive_ptr_release(Exec* e);
-XBT_PUBLIC void intrusive_ptr_add_ref(Exec* e);
-
-class Host;
-class Link;
-class Mailbox;
-using MailboxPtr = boost::intrusive_ptr<Mailbox>;
-XBT_PUBLIC void intrusive_ptr_release(Mailbox* m);
-XBT_PUBLIC void intrusive_ptr_add_ref(Mailbox* m);
-class Mutex;
-XBT_PUBLIC void intrusive_ptr_release(Mutex* m);
-XBT_PUBLIC void intrusive_ptr_add_ref(Mutex* m);
-class NetZone;
-class VirtualMachine;
-class File;
-class Storage;
-}
-}
-
-#endif

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 2650faf..fed584c 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -680,7 +680,6 @@ set(headers_to_install
   include/simgrid/storage.h
   include/simgrid/vm.h
   include/simgrid/zone.h
-  include/simgrid/s4u/forward.hpp
   include/simgrid/s4u/Activity.hpp
   include/simgrid/s4u/Actor.hpp
   include/simgrid/s4u/Comm.hpp