Revert "msg_private.h is a C++ header so add pp"

This reverts commit fbf96d959e4912fe445823b75cf102a0e89131e2.

diff --git a/src/msg/instr_msg_process.cpp b/src/msg/instr_msg_process.cpp
index d2d6be0..bcdb775 100644 (file)
--- a/src/msg/instr_msg_process.cpp
+++ b/src/msg/instr_msg_process.cpp
@@ -4,8 +4,8 @@
 /* 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. */
 
-#include "msg_private.hpp"
 #include "src/simix/ActorImpl.hpp"
+#include "msg_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
 

diff --git a/src/msg/instr_msg_task.cpp b/src/msg/instr_msg_task.cpp
index a6f655b..c450a22 100644 (file)
--- a/src/msg/instr_msg_task.cpp
+++ b/src/msg/instr_msg_task.cpp
@@ -5,8 +5,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/instr/instr_private.h"
+#include "msg_private.h"
 #include "mc/mc.h"
-#include "msg_private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg, instr, "MSG");
 

diff --git a/src/msg/instr_msg_vm.cpp b/src/msg/instr_msg_vm.cpp
index 2c9478e..995a22d 100644 (file)
--- a/src/msg/instr_msg_vm.cpp
+++ b/src/msg/instr_msg_vm.cpp
@@ -4,7 +4,7 @@
 /* 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. */
 
-#include "msg_private.hpp"
+#include "msg_private.h"
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_vm, instr, "MSG VM");

diff --git a/src/msg/msg_actions.cpp b/src/msg/msg_actions.cpp
index 461b7cb..85f009f 100644 (file)
--- a/src/msg/msg_actions.cpp
+++ b/src/msg/msg_actions.cpp
@@ -4,11 +4,11 @@
 /* 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. */
 
+#include "msg_private.h"
 #include "xbt/dynar.h"
 #include "xbt/replay.h"
 
 #include <errno.h>
-#include "msg_private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_action, msg, "MSG actions for trace driven simulation");
 

diff --git a/src/msg/msg_deployment.cpp b/src/msg/msg_deployment.cpp
index 6f09557..015d748 100644 (file)
--- a/src/msg/msg_deployment.cpp
+++ b/src/msg/msg_deployment.cpp
@@ -4,9 +4,9 @@
 /* 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. */
 
+#include "msg_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "msg_private.hpp"
 
 /** \ingroup msg_simulation
  * \brief An application deployer.

diff --git a/src/msg/msg_environment.cpp b/src/msg/msg_environment.cpp
index bd0ec18..5e29b97 100644 (file)
--- a/src/msg/msg_environment.cpp
+++ b/src/msg/msg_environment.cpp
@@ -4,12 +4,12 @@
 /* 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. */
 
+#include "msg_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 
 #include "simgrid/s4u/As.hpp"
 #include "simgrid/s4u/engine.hpp"
-#include "msg_private.hpp"
 
 #if HAVE_LUA
 #include <lua.h>

diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index f787cc0..9a95300 100644 (file)
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -8,11 +8,10 @@
 
 #include "simgrid/msg.h"
 #include "instr/instr_interface.h"
+#include "msg_private.h"
 #include "mc/mc.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-
-#include "msg_private.hpp"
 #include "simgrid/sg_config.h" /* Configuration mechanism of SimGrid */
 #include "src/surf/xml/platf_private.hpp" // FIXME: KILLME by removing MSG_post_create_environment()
 

diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp
index 865aa3e..295ba5f 100644 (file)
--- a/src/msg/msg_gos.cpp
+++ b/src/msg/msg_gos.cpp
@@ -6,10 +6,10 @@
 #include <xbt/ex.hpp>
 
 #include "src/simix/smx_private.h" /* MSG_task_listen looks inside the rdv directly. Not clean. */
+#include "msg_private.h"
 #include "mc/mc.h"
 #include "xbt/log.h"
 #include "xbt/sysdep.h"
-#include "msg_private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg, "Logging specific to MSG (gos)");
 

diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp
index c1af957..6a56a66 100644 (file)
--- a/src/msg/msg_host.cpp
+++ b/src/msg/msg_host.cpp
@@ -4,11 +4,11 @@
 /* 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. */
 
+#include "src/msg/msg_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "simgrid/simix.h"
 #include <simgrid/s4u/host.hpp>
-#include "msg_private.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg);
 

diff --git a/src/msg/msg_io.cpp b/src/msg/msg_io.cpp
index 6e99bcf..510ac65 100644 (file)
--- a/src/msg/msg_io.cpp
+++ b/src/msg/msg_io.cpp
@@ -6,8 +6,8 @@
 
 #include <simgrid/s4u/host.hpp>
 
+#include "msg_private.h"
 #include "xbt/log.h"
-#include "msg_private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io, msg, "Logging specific to MSG (io)");
 

diff --git a/src/msg/msg_mailbox.cpp b/src/msg/msg_mailbox.cpp
index 8b09b2e..2186710 100644 (file)
--- a/src/msg/msg_mailbox.cpp
+++ b/src/msg/msg_mailbox.cpp
@@ -9,9 +9,8 @@
 #include <xbt/ex.hpp>
 
 #include "simgrid/msg.h"
+#include "msg_private.h"
 #include "simgrid/s4u/Actor.hpp"
-
-#include "msg_private.hpp"
 #include "simgrid/s4u/Mailbox.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg, "Logging specific to MSG (mailbox)");

diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.h
similarity index 100%
rename from src/msg/msg_private.hpp
rename to src/msg/msg_private.h

diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp
index ada529c..17b02ef 100644 (file)
--- a/src/msg/msg_process.cpp
+++ b/src/msg/msg_process.cpp
@@ -6,11 +6,10 @@
 
 #include <functional>
 
+#include "msg_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/functional.hpp"
-
-#include "msg_private.hpp"
 #include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_private.h"
 

diff --git a/src/msg/msg_synchro.cpp b/src/msg/msg_synchro.cpp
index 4c00c9c..fa46da9 100644 (file)
--- a/src/msg/msg_synchro.cpp
+++ b/src/msg/msg_synchro.cpp
@@ -6,10 +6,10 @@
 
 #include <xbt/ex.hpp>
 
+#include "msg_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/synchro_core.h"
 #include "xbt/log.h"
-#include "msg_private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_synchro, msg, "Logging specific to MSG (synchro)");
 

diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp
index 1e8986f..a8b0c6b 100644 (file)
--- a/src/msg/msg_task.cpp
+++ b/src/msg/msg_task.cpp
@@ -3,10 +3,10 @@
 /* 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. */
 
+#include "msg_private.h"
 #include "src/simix/smx_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "msg_private.hpp"
 
 /** @addtogroup m_task_management
  *

diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp
index 1879dd2..2198f6d 100644 (file)
--- a/src/msg/msg_vm.cpp
+++ b/src/msg/msg_vm.cpp
@@ -13,10 +13,10 @@
 
 #include <simgrid/s4u/host.hpp>
 
+#include "msg_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "simgrid/host.h"
-#include "msg_private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_vm, msg, "Cloud-oriented parts of the MSG API");
 

diff --git a/src/s4u/s4u_activity.cpp b/src/s4u/s4u_activity.cpp
index 12343db..4568abb 100644 (file)
--- a/src/s4u/s4u_activity.cpp
+++ b/src/s4u/s4u_activity.cpp
@@ -5,8 +5,9 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/log.h"
+#include "src/msg/msg_private.h"
+
 #include "simgrid/s4u/Activity.hpp"
-#include "../msg/msg_private.hpp"
 
 XBT_LOG_EXTERNAL_CATEGORY(s4u);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_activity,s4u,"S4U activities");

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index c239a29..1b46b96 100644 (file)
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -5,11 +5,11 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/log.h"
+#include "src/msg/msg_private.h"
+
 #include "simgrid/s4u/Actor.hpp"
 #include "simgrid/s4u/comm.hpp"
 #include "simgrid/s4u/host.hpp"
-
-#include "../msg/msg_private.hpp"
 #include "simgrid/s4u/Mailbox.hpp"
 
 #include "src/kernel/context/Context.hpp"

diff --git a/src/s4u/s4u_comm.cpp b/src/s4u/s4u_comm.cpp
index 6d051ec..3d6be86 100644 (file)
--- a/src/s4u/s4u_comm.cpp
+++ b/src/s4u/s4u_comm.cpp
@@ -5,9 +5,10 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/log.h"
+#include "src/msg/msg_private.h"
+
 #include "simgrid/s4u/comm.hpp"
 #include <simgrid/s4u/Mailbox.hpp>
-#include "../msg/msg_private.hpp"
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_comm,s4u_activity,"S4U asynchronous communications");

diff --git a/src/s4u/s4u_file.cpp b/src/s4u/s4u_file.cpp
index 3256e27..7512efb 100644 (file)
--- a/src/s4u/s4u_file.cpp
+++ b/src/s4u/s4u_file.cpp
@@ -4,11 +4,11 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/log.h"
+#include "src/msg/msg_private.h"
+
 #include "simgrid/s4u/Actor.hpp"
 #include "simgrid/s4u/comm.hpp"
 #include "simgrid/s4u/host.hpp"
-
-#include "../msg/msg_private.hpp"
 #include "simgrid/s4u/Mailbox.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_file,"S4U files");

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index 9af3032..d38b8e0 100644 (file)
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -13,12 +13,12 @@
 #include "simgrid/simix.hpp"
 #include "src/surf/HostImpl.hpp"
 #include "xbt/log.h"
+#include "src/msg/msg_private.h"
 #include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_private.h"
 #include "src/surf/cpu_interface.hpp"
 #include "simgrid/s4u/host.hpp"
 #include "simgrid/s4u/storage.hpp"
-#include "../msg/msg_private.hpp"
 
 int MSG_HOST_LEVEL = -1;
 int USER_HOST_LEVEL = -1;

diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp
index 90233b5..c23d735 100644 (file)
--- a/src/s4u/s4u_mailbox.cpp
+++ b/src/s4u/s4u_mailbox.cpp
@@ -5,8 +5,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/log.h"
-
-#include "../msg/msg_private.hpp"
+#include "src/msg/msg_private.h"
 #include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_network_private.h"
 #include "simgrid/s4u/Mailbox.hpp"

diff --git a/src/s4u/s4u_mutex.cpp b/src/s4u/s4u_mutex.cpp
index 20d87d9..4f2cce6 100644 (file)
--- a/src/s4u/s4u_mutex.cpp
+++ b/src/s4u/s4u_mutex.cpp
@@ -5,10 +5,10 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/log.h"
+#include "src/msg/msg_private.h"
 #include "src/simix/smx_synchro_private.h"
 
 #include "simgrid/s4u/Mutex.hpp"
-#include "../msg/msg_private.hpp"
 
 namespace simgrid {
 namespace s4u {

diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index 6aaab5e..d283b1e 100644 (file)
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -20,12 +20,12 @@
 #include <simgrid/s4u/host.hpp>
 
 #include <mc/mc.h>
-#include "../msg/msg_private.hpp"
 
 #include "src/surf/surf_interface.hpp"
 #include "smx_private.h"
 #include "src/mc/mc_replay.h"
 #include "src/mc/Client.hpp"
+#include "src/msg/msg_private.h"
 #include "src/kernel/activity/SynchroSleep.hpp"
 #include "src/kernel/activity/SynchroRaw.hpp"
 #include "src/kernel/activity/SynchroIo.hpp"

diff --git a/src/smpi/smpi_global.cpp b/src/smpi/smpi_global.cpp
index 560bce2..5429977 100644 (file)
--- a/src/smpi/smpi_global.cpp
+++ b/src/smpi/smpi_global.cpp
@@ -14,6 +14,7 @@
 #include "src/simix/smx_private.h"
 #include "simgrid/sg_config.h"
 #include "src/mc/mc_replay.h"
+#include "src/msg/msg_private.h"
 #include "src/kernel/activity/SynchroComm.hpp"
 
 #include <float.h> /* DBL_MAX */
@@ -24,7 +25,6 @@
 #include <stdlib.h>
 #include <string>
 #include <vector>
-#include "../msg/msg_private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi, "Logging specific to SMPI (kernel)");
 #include <boost/tokenizer.hpp>

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 11a7f08..ba6c3c0 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -14,7 +14,7 @@ set(EXTRA_DIST
   src/include/surf/datatypes.h
   src/include/surf/maxmin.h
   src/include/surf/surf.h
-  src/msg/msg_private.hpp
+  src/msg/msg_private.h
   src/simdag/dax.dtd
   src/simdag/dax_dtd.c
   src/simdag/dax_dtd.h