X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8250fdfeb9c8dd3ae2a1d19f3c89871c9599d0f8..e36a2202155d007c72d9f54fdddf3f422a8503f8:/include/simgrid/simix.h
diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index 02d8112b02..4d551932c5 100644
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-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. */
@@ -8,52 +7,11 @@
#define _SIMIX_SIMIX_H
#include "simgrid/datatypes.h"
+#include "simgrid/forward.h"
#include "simgrid/host.h"
#include "xbt/ex.h"
#include "xbt/parmap.h"
-
-#ifdef __cplusplus
-
-namespace simgrid {
-namespace kernel {
-namespace context {
- class Context;
- class ContextFactory;
-}}
-
-namespace simix {
-
- /** @brief Process datatype
- @ingroup simix_process_management
-
- A process may be defined as a code, with some private
- data, executing in a location.
- \see m_process_management
- @{ */
- class ActorImpl;
- class Mutex;
- class MailboxImpl;
-}
-}
-
-typedef simgrid::kernel::context::Context *smx_context_t;
-typedef simgrid::simix::ActorImpl *smx_actor_t;
-typedef simgrid::simix::Mutex *smx_mutex_t;
-typedef simgrid::simix::MailboxImpl* smx_mailbox_t;
-
-#else
-
-typedef struct s_smx_context *smx_context_t;
-typedef struct s_smx_actor *smx_actor_t;
-typedef struct s_smx_mutex *smx_mutex_t;
-typedef struct s_smx_mailbox *smx_mailbox_t;
-
-#endif
-
-/**************************** Scalar Values **********************************/
-
-typedef union u_smx_scalar u_smx_scalar_t;
-
+#include