X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e30d391831c58e590aa83dce5f30f218cc3f53ce..55e6d07cfba4948a918765e9d6fd2801d3639a4a:/src/simix/popping_private.hpp

diff --git a/src/simix/popping_private.hpp b/src/simix/popping_private.hpp
index 8561f7d574..c20bd04b34 100644
--- a/src/simix/popping_private.hpp
+++ b/src/simix/popping_private.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. 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. */
@@ -6,12 +6,8 @@
 #ifndef SG_POPPING_PRIVATE_HPP
 #define SG_POPPING_PRIVATE_HPP
 
-#include <simgrid/simix.h>
-#include <xbt/base.h>
-
-#include <src/kernel/activity/ActivityImpl.hpp>
-#include <src/kernel/activity/CommImpl.hpp>
-#include <src/kernel/activity/ExecImpl.hpp>
+#include "simgrid/forward.h"
+#include "src/kernel/activity/ActivityImpl.hpp"
 
 #include <boost/intrusive_ptr.hpp>
 
@@ -21,7 +17,7 @@ XBT_PUBLIC_DATA const char* simcall_names[]; /* Name of each simcall */
 #include "popping_enum.h" /* Definition of e_smx_simcall_t, with one value per simcall */
 
 typedef int (*simix_match_func_t)(void*, void*, simgrid::kernel::activity::CommImpl*);
-typedef void (*simix_copy_data_func_t)(smx_activity_t, void*, size_t);
+typedef void (*simix_copy_data_func_t)(simgrid::kernel::activity::CommImpl*, void*, size_t);
 typedef void (*simix_clean_func_t)(void*);
 typedef void (*FPtr)(void); // Hide the ugliness
 
@@ -43,7 +39,7 @@ union u_smx_scalar {
 };
 
 /**
- * \brief Represents a simcall to the kernel.
+ * @brief Represents a simcall to the kernel.
  */
 struct s_smx_simcall {
   e_smx_simcall_t call;