X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5ae4444e56c58d6a957263114cff7d81ff48f6a8..9cca09ad88fcaeb49f2637de97df519c3920aaa4:/include/simgrid/simix.h
diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index 9beaaf80c3..8d2729174a 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. */
@@ -7,55 +6,15 @@
#ifndef _SIMIX_SIMIX_H
#define _SIMIX_SIMIX_H
-#include "xbt/misc.h"
-#include "xbt/fifo.h"
-#include "xbt/dict.h"
-#include "xbt/function_types.h"
-#include "xbt/parmap.h"
-#include "xbt/swag.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 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 Process;
- class Context;
- class ContextFactory;
- class Mutex;
-}
-}
-
-typedef simgrid::simix::Context *smx_context_t;
-typedef simgrid::simix::Process *smx_process_t;
-
-/**
- * \ingroup simix_synchro_management
- */
-typedef simgrid::simix::Mutex *smx_mutex_t;
-
-#else
-
-typedef struct s_smx_context *smx_context_t;
-typedef struct s_smx_process *smx_process_t;
-typedef struct s_smx_mutex *smx_mutex_t;
-
+#include