From: Martin Quinson Date: Sun, 14 Aug 2016 11:49:00 +0000 (+0200) Subject: mv s4u/mailbox.hpp s4u/Mailbox.hpp now that it's clean X-Git-Tag: v3_14~560 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/11ae3bfac7b4c85a23e220b9d0755449a622a37b?ds=sidebyside 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 7c0139613f..89f79d1043 100644 --- a/include/simgrid/s4u.hpp +++ b/include/simgrid/s4u.hpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp index 89ea5f469a..95daaa287a 100644 --- a/include/simgrid/s4u/Actor.hpp +++ b/include/simgrid/s4u/Actor.hpp @@ -25,7 +25,6 @@ #include #include #include -#include 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 ff5ec4218f..941a553ddc 100644 --- a/include/simgrid/s4u/comm.hpp +++ b/include/simgrid/s4u/comm.hpp @@ -10,7 +10,6 @@ #include #include -#include #include diff --git a/src/msg/msg_mailbox.cpp b/src/msg/msg_mailbox.cpp index e533c9e275..218671054d 100644 --- 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 803a979ebd..7a53a102dd 100644 --- 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 4fd7d4e122..9191568766 100644 --- 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 + 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 3df3b92d57..890ef245ce 100644 --- 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 1eabd4b347..7512efb3a7 100644 --- 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 57d94c7105..c23d735e4c 100644 --- 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 5ca395ff8b..a5ff8a7263 100644 --- 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 c38eef82b9..c2a9aa683a 100644 --- a/src/simix/smx_network_private.h +++ b/src/simix/smx_network_private.h @@ -14,7 +14,7 @@ #include -#include +#include #include "simgrid/simix.h" #include "popping_private.h" diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index b292192068..594befe80f 100644 --- 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