this header file is much less interesting now that it's almost empty

diff --git a/include/simgrid/modelchecker.h b/include/simgrid/modelchecker.h
index 7c7d09a..11bd0b1 100644 (file)
--- a/include/simgrid/modelchecker.h
+++ b/include/simgrid/modelchecker.h
@@ -1,7 +1,6 @@
 /* simgrid/modelchecker.h - Formal Verification made possible in SimGrid    */
 
 /* simgrid/modelchecker.h - Formal Verification made possible in SimGrid    */
 

-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2008-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. */
 
 /* 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. */

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index 97b1985..bf07805 100644 (file)
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -7,8 +7,6 @@
 
 #include "src/kernel/context/Context.hpp"
 #include "src/simix/smx_private.h"
 
 #include "src/kernel/context/Context.hpp"
 #include "src/simix/smx_private.h"

-#include "src/mc/mc_ignore.h"
-

 
 /**
  * @brief creates a new context for a user level process
 
 /**
  * @brief creates a new context for a user level process

diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp
index 5afc40f..fa39f6c 100644 (file)
--- a/src/kernel/context/ContextRaw.cpp
+++ b/src/kernel/context/ContextRaw.cpp
@@ -9,7 +9,6 @@
 
 #include "src/simix/smx_private.h"
 #include "mc/mc.h"
 
 #include "src/simix/smx_private.h"
 #include "mc/mc.h"

-#include "src/mc/mc_ignore.h"

 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 

diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp
index 1b8c718..f611391 100644 (file)
--- a/src/mc/ModelChecker.cpp
+++ b/src/mc/ModelChecker.cpp
@@ -27,7 +27,6 @@
 #include "src/mc/Transition.hpp"
 #include "src/mc/checker/Checker.hpp"
 #include "src/mc/mc_exit.h"
 #include "src/mc/Transition.hpp"
 #include "src/mc/checker/Checker.hpp"
 #include "src/mc/mc_exit.h"

-#include "src/mc/mc_ignore.h"

 #include "src/mc/mc_private.h"
 #include "src/mc/mc_record.h"
 #include "src/mc/remote/mc_protocol.h"
 #include "src/mc/mc_private.h"
 #include "src/mc/mc_record.h"
 #include "src/mc/remote/mc_protocol.h"

diff --git a/src/mc/Process.cpp b/src/mc/Process.cpp
index 26447a3..47a0637 100644 (file)
--- a/src/mc/Process.cpp
+++ b/src/mc/Process.cpp
@@ -34,7 +34,6 @@
 
 #include "src/mc/mc_unw.h"
 #include "src/mc/mc_snapshot.h"
 
 #include "src/mc/mc_unw.h"
 #include "src/mc/mc_snapshot.h"

-#include "src/mc/mc_ignore.h"

 #include "src/mc/mc_smx.h"
 
 #include "src/mc/Process.hpp"
 #include "src/mc/mc_smx.h"
 
 #include "src/mc/Process.hpp"

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index 85dbe92..80ecca5 100644 (file)
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -31,7 +31,6 @@
 #if SIMGRID_HAVE_MC
 #include <libunwind.h>
 #include "src/mc/mc_comm_pattern.h"
 #if SIMGRID_HAVE_MC
 #include <libunwind.h>
 #include "src/mc/mc_comm_pattern.h"

-#include "src/mc/mc_ignore.h"

 #include "src/mc/mc_request.h"
 #include "src/mc/mc_safety.h"
 #include "src/mc/mc_snapshot.h"
 #include "src/mc/mc_request.h"
 #include "src/mc/mc_safety.h"
 #include "src/mc/mc_snapshot.h"

diff --git a/src/mc/mc_ignore.h b/src/mc/mc_ignore.h
index fef3326..58f1795 100644 (file)
--- a/src/mc/mc_ignore.h
+++ b/src/mc/mc_ignore.h
@@ -7,20 +7,14 @@
 #define SIMGRID_MC_IGNORE_H
 
 #include "src/internal_config.h"
 #define SIMGRID_MC_IGNORE_H
 
 #include "src/internal_config.h"

-#include "xbt/dynar.h"

 
 #if HAVE_UCONTEXT_H
 #include <ucontext.h>           /* context relative declarations */
 
 #if HAVE_UCONTEXT_H
 #include <ucontext.h>           /* context relative declarations */

-#endif
-

 
 SG_BEGIN_DECL();
 
 SG_BEGIN_DECL();

-
-#if HAVE_UCONTEXT_H

 XBT_PUBLIC(void) MC_register_stack_area(void *stack, smx_actor_t process, ucontext_t* context, size_t size);
 XBT_PUBLIC(void) MC_register_stack_area(void *stack, smx_actor_t process, ucontext_t* context, size_t size);

-#endif
-
-

 SG_END_DECL();
 
 #endif
 SG_END_DECL();
 
 #endif

+
+#endif

diff --git a/src/mc/remote/Client.cpp b/src/mc/remote/Client.cpp
index 626b9b5..602c2eb 100644 (file)
--- a/src/mc/remote/Client.cpp
+++ b/src/mc/remote/Client.cpp
@@ -25,7 +25,6 @@
 #include "src/mc/remote/mc_protocol.h"
 
 // We won't need those once the separation MCer/MCed is complete:
 #include "src/mc/remote/mc_protocol.h"
 
 // We won't need those once the separation MCer/MCed is complete:

-#include "src/mc/mc_ignore.h"

 #include "src/mc/mc_smx.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_client, mc, "MC client logic");
 #include "src/mc/mc_smx.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_client, mc, "MC client logic");

diff --git a/src/msg/instr_msg_task.cpp b/src/msg/instr_msg_task.cpp
index c4236de..65b69cc 100644 (file)
--- a/src/msg/instr_msg_task.cpp
+++ b/src/msg/instr_msg_task.cpp
@@ -7,7 +7,6 @@
 #include "mc/mc.h"
 #include "src/instr/instr_private.h"
 #include "src/msg/msg_private.h"
 #include "mc/mc.h"
 #include "src/instr/instr_private.h"
 #include "src/msg/msg_private.h"

-#include "src/mc/mc_ignore.h"

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_msg, instr, "MSG instrumentation");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_msg, instr, "MSG instrumentation");
 

diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index fce5d4c..3f4d543 100644 (file)
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -9,7 +9,6 @@
 #include "instr/instr_interface.h"
 #include "mc/mc.h"
 #include "src/msg/msg_private.h"
 #include "instr/instr_interface.h"
 #include "mc/mc.h"
 #include "src/msg/msg_private.h"

-#include "src/mc/mc_ignore.h"

 
 XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, "Logging specific to MSG (kernel)");
 
 XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, "Logging specific to MSG (kernel)");

diff --git a/src/smpi/smpi_process.cpp b/src/smpi/smpi_process.cpp
index 446a560..b6bc56a 100644 (file)
--- a/src/smpi/smpi_process.cpp
+++ b/src/smpi/smpi_process.cpp
@@ -4,7 +4,6 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "mc/mc.h"
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "mc/mc.h"

-#include "src/mc/mc_ignore.h"

 #include "src/mc/mc_replay.h"
 #include "src/msg/msg_private.h"
 #include "src/simix/smx_private.h"
 #include "src/mc/mc_replay.h"
 #include "src/msg/msg_private.h"
 #include "src/simix/smx_private.h"

diff --git a/src/xbt/mmalloc/mfree.c b/src/xbt/mmalloc/mfree.c
index 5294c14..66ec157 100644 (file)
--- a/src/xbt/mmalloc/mfree.c
+++ b/src/xbt/mmalloc/mfree.c
@@ -13,7 +13,6 @@
 #include "mmprivate.h"
 #include "xbt/ex.h"
 #include "mc/mc.h"
 #include "mmprivate.h"
 #include "xbt/ex.h"
 #include "mc/mc.h"

-#include "src/mc/mc_ignore.h"

 
 /* Return memory to the heap.
    Like `mfree' but don't call a mfree_hook if there is one.  */
 
 /* Return memory to the heap.
    Like `mfree' but don't call a mfree_hook if there is one.  */