mv s4u/mailbox.hpp s4u/Mailbox.hpp now that it's clean

diff --git a/include/simgrid/s4u.hpp b/include/simgrid/s4u.hpp
index 7c01396..89f79d1 100644 (file)
--- a/include/simgrid/s4u.hpp
+++ b/include/simgrid/s4u.hpp
@@ -8,7 +8,7 @@
 
 #include <simgrid/s4u/Activity.hpp>
 #include <simgrid/s4u/Actor.hpp>
-#include <simgrid/s4u/mailbox.hpp>
+#include <simgrid/s4u/Mailbox.hpp>
 #include <simgrid/s4u/engine.hpp>
 #include <simgrid/s4u/host.hpp>
 

diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp
index 89ea5f4..95daaa2 100644 (file)
--- a/include/simgrid/s4u/Actor.hpp
+++ b/include/simgrid/s4u/Actor.hpp
@@ -25,7 +25,6 @@
 #include <simgrid/chrono.hpp>
 #include <simgrid/simix.h>
 #include <simgrid/s4u/forward.hpp>
-#include <simgrid/s4u/mailbox.hpp>
 
 namespace simgrid {
 namespace s4u {

diff --git a/include/simgrid/s4u/mailbox.hpp b/include/simgrid/s4u/Mailbox.hpp
similarity index 100%
rename from include/simgrid/s4u/mailbox.hpp
rename to include/simgrid/s4u/Mailbox.hpp

diff --git a/include/simgrid/s4u/comm.hpp b/include/simgrid/s4u/comm.hpp
index ff5ec42..941a553 100644 (file)
--- a/include/simgrid/s4u/comm.hpp
+++ b/include/simgrid/s4u/comm.hpp
@@ -10,7 +10,6 @@
 
 #include <simgrid/s4u/Activity.hpp>
 #include <simgrid/s4u/forward.hpp>
-#include <simgrid/s4u/mailbox.hpp>
 #include <simgrid/forward.h>
 
 

diff --git a/src/msg/msg_mailbox.cpp b/src/msg/msg_mailbox.cpp
index e533c9e..2186710 100644 (file)
--- a/src/msg/msg_mailbox.cpp
+++ b/src/msg/msg_mailbox.cpp
@@ -11,7 +11,7 @@
 #include "simgrid/msg.h"
 #include "msg_private.h"
 #include "simgrid/s4u/Actor.hpp"
-#include "simgrid/s4u/mailbox.hpp"
+#include "simgrid/s4u/Mailbox.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg, "Logging specific to MSG (mailbox)");
 

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 803a979..7a53a10 100644 (file)
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -10,7 +10,7 @@
 #include "simgrid/s4u/Actor.hpp"
 #include "simgrid/s4u/comm.hpp"
 #include "simgrid/s4u/host.hpp"
-#include "simgrid/s4u/mailbox.hpp"
+#include "simgrid/s4u/Mailbox.hpp"
 
 #include "src/kernel/context/Context.hpp"
 #include "src/simix/smx_private.h"

diff --git a/src/s4u/s4u_comm.cpp b/src/s4u/s4u_comm.cpp
index 4fd7d4e..9191568 100644 (file)
--- a/src/s4u/s4u_comm.cpp
+++ b/src/s4u/s4u_comm.cpp
@@ -8,6 +8,8 @@
 #include "src/msg/msg_private.h"
 
 #include "simgrid/s4u/comm.hpp"
+#include <simgrid/s4u/Mailbox.hpp>
+
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_comm,s4u_activity,"S4U asynchronous communications");
 

diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp
index 3df3b92..890ef24 100644 (file)
--- a/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@ -9,7 +9,7 @@
 #include "mc/mc.h"
 #include "simgrid/s4u/As.hpp"
 #include "simgrid/s4u/engine.hpp"
-#include "simgrid/s4u/mailbox.hpp"
+#include "simgrid/s4u/Mailbox.hpp"
 #include "simgrid/s4u/storage.hpp"
 
 #include "surf/surf.h"               // routing_platf. FIXME:KILLME. SOON

diff --git a/src/s4u/s4u_file.cpp b/src/s4u/s4u_file.cpp
index 1eabd4b..7512efb 100644 (file)
--- a/src/s4u/s4u_file.cpp
+++ b/src/s4u/s4u_file.cpp
@@ -9,7 +9,7 @@
 #include "simgrid/s4u/Actor.hpp"
 #include "simgrid/s4u/comm.hpp"
 #include "simgrid/s4u/host.hpp"
-#include "simgrid/s4u/mailbox.hpp"
+#include "simgrid/s4u/Mailbox.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_file,"S4U files");
 

diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp
index 57d94c7..c23d735 100644 (file)
--- a/src/s4u/s4u_mailbox.cpp
+++ b/src/s4u/s4u_mailbox.cpp
@@ -8,7 +8,7 @@
 #include "src/msg/msg_private.h"
 #include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_network_private.h"
-#include "simgrid/s4u/mailbox.hpp"
+#include "simgrid/s4u/Mailbox.hpp"
 
 XBT_LOG_EXTERNAL_CATEGORY(s4u);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel,s4u,"S4U Communication Mailboxes");

diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp
index 5ca395f..a5ff8a7 100644 (file)
--- a/src/simix/smx_network.cpp
+++ b/src/simix/smx_network.cpp
@@ -17,7 +17,7 @@
 #include "mc/mc.h"
 #include "src/mc/mc_replay.h"
 #include "xbt/dict.h"
-#include "simgrid/s4u/mailbox.hpp"
+#include "simgrid/s4u/Mailbox.hpp"
 
 #include "src/kernel/activity/SynchroComm.hpp"
 

diff --git a/src/simix/smx_network_private.h b/src/simix/smx_network_private.h
index c38eef8..c2a9aa6 100644 (file)
--- a/src/simix/smx_network_private.h
+++ b/src/simix/smx_network_private.h
@@ -14,7 +14,7 @@
 
 #include <xbt/base.h>
 
-#include <simgrid/s4u/mailbox.hpp>
+#include <simgrid/s4u/Mailbox.hpp>
 
 #include "simgrid/simix.h"
 #include "popping_private.h"

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index b292192..594befe 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -649,7 +649,7 @@ set(headers_to_install
   include/simgrid/s4u/engine.hpp  
   include/simgrid/s4u/file.hpp  
   include/simgrid/s4u/host.hpp  
-  include/simgrid/s4u/mailbox.hpp  
+  include/simgrid/s4u/Mailbox.hpp
   include/simgrid/s4u/Mutex.hpp
   include/simgrid/s4u/conditionVariable.hpp
   include/simgrid/s4u/storage.hpp