From 6fbbccdc1e85be059469b32886a28a26d4d7b0ce Mon Sep 17 00:00:00 2001 From: cherierm Date: Fri, 12 Sep 2008 13:44:17 +0000 Subject: [PATCH] change consecutive to the renaming of the C++ wrappers git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5925 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/cxx/autoDestination/BasicTask.hpp | 2 +- examples/cxx/autoDestination/FinalizeTask.hpp | 2 +- examples/cxx/autoDestination/Forwarder.cxx | 2 +- examples/cxx/autoDestination/Forwarder.hpp | 2 +- examples/cxx/autoDestination/Main.cxx | 2 +- examples/cxx/autoDestination/Master.cxx | 2 +- examples/cxx/autoDestination/Master.hpp | 2 +- examples/cxx/autoDestination/Slave.cxx | 2 +- examples/cxx/autoDestination/Slave.hpp | 2 +- examples/cxx/basic/BasicTask.hpp | 2 +- examples/cxx/basic/FinalizeTask.hpp | 2 +- examples/cxx/basic/Forwarder.cxx | 2 +- examples/cxx/basic/Forwarder.hpp | 2 +- examples/cxx/basic/Main.cxx | 2 +- examples/cxx/basic/Master.cxx | 2 +- examples/cxx/basic/Master.hpp | 2 +- examples/cxx/basic/Slave.cxx | 2 +- examples/cxx/basic/Slave.hpp | 2 +- examples/cxx/comm_time/CommTimeTask.hpp | 2 +- examples/cxx/comm_time/FinalizeTask.hpp | 2 +- examples/cxx/comm_time/Main.cxx | 2 +- examples/cxx/comm_time/Master.cxx | 2 +- examples/cxx/comm_time/Master.hpp | 2 +- examples/cxx/comm_time/Slave.cxx | 4 ++-- examples/cxx/comm_time/Slave.hpp | 2 +- examples/cxx/explicitDestination/BasicTask.hpp | 2 +- examples/cxx/explicitDestination/FinalizeTask.hpp | 2 +- examples/cxx/explicitDestination/Forwarder.cxx | 2 +- examples/cxx/explicitDestination/Forwarder.hpp | 2 +- examples/cxx/explicitDestination/Main.cxx | 2 +- examples/cxx/explicitDestination/Master.cxx | 2 +- examples/cxx/explicitDestination/Master.hpp | 2 +- examples/cxx/explicitDestination/Slave.cxx | 2 +- examples/cxx/explicitDestination/Slave.hpp | 2 +- examples/cxx/ping_pong/Main.cxx | 2 +- examples/cxx/ping_pong/PingPongTask.hpp | 2 +- examples/cxx/ping_pong/Receiver.cxx | 2 +- examples/cxx/ping_pong/Receiver.hpp | 2 +- examples/cxx/ping_pong/Sender.cxx | 4 ++-- examples/cxx/ping_pong/Sender.hpp | 2 +- examples/cxx/suspend/DreamMaster.cxx | 2 +- examples/cxx/suspend/DreamMaster.hpp | 2 +- examples/cxx/suspend/LazyGuy.cxx | 2 +- examples/cxx/suspend/LazyGuy.hpp | 2 +- examples/cxx/suspend/Main.cxx | 2 +- 45 files changed, 47 insertions(+), 47 deletions(-) diff --git a/examples/cxx/autoDestination/BasicTask.hpp b/examples/cxx/autoDestination/BasicTask.hpp index bef66e2d54..8e2866d7bf 100644 --- a/examples/cxx/autoDestination/BasicTask.hpp +++ b/examples/cxx/autoDestination/BasicTask.hpp @@ -1,7 +1,7 @@ #ifndef BASIC_TASK_HPP #define BASIC_TASK_HPP -#include +#include using namespace SimGrid::Msg; class BasicTask : public Task diff --git a/examples/cxx/autoDestination/FinalizeTask.hpp b/examples/cxx/autoDestination/FinalizeTask.hpp index a181ae33d5..62f7adeeaa 100644 --- a/examples/cxx/autoDestination/FinalizeTask.hpp +++ b/examples/cxx/autoDestination/FinalizeTask.hpp @@ -1,7 +1,7 @@ #ifndef FINALIZE_TASK_HPP #define FINALIZE_TASK_HPP -#include +#include using namespace SimGrid::Msg; class FinalizeTask : public Task diff --git a/examples/cxx/autoDestination/Forwarder.cxx b/examples/cxx/autoDestination/Forwarder.cxx index 8872e0b3c1..052bf87ef3 100644 --- a/examples/cxx/autoDestination/Forwarder.cxx +++ b/examples/cxx/autoDestination/Forwarder.cxx @@ -2,7 +2,7 @@ #include "BasicTask.hpp" #include "FinalizeTask.hpp" -#include +#include #include #include diff --git a/examples/cxx/autoDestination/Forwarder.hpp b/examples/cxx/autoDestination/Forwarder.hpp index 767334bfe1..b09b821635 100644 --- a/examples/cxx/autoDestination/Forwarder.hpp +++ b/examples/cxx/autoDestination/Forwarder.hpp @@ -1,7 +1,7 @@ #ifndef FORWARDER_HPP #define FORWARDER_HPP -#include +#include using namespace SimGrid::Msg; class Forwarder : public Process diff --git a/examples/cxx/autoDestination/Main.cxx b/examples/cxx/autoDestination/Main.cxx index 696bdc2dfd..cf27e28bb6 100644 --- a/examples/cxx/autoDestination/Main.cxx +++ b/examples/cxx/autoDestination/Main.cxx @@ -1,4 +1,4 @@ -#include +#include using namespace SimGrid::Msg; diff --git a/examples/cxx/autoDestination/Master.cxx b/examples/cxx/autoDestination/Master.cxx index 323d2d18ff..6abe58fa14 100644 --- a/examples/cxx/autoDestination/Master.cxx +++ b/examples/cxx/autoDestination/Master.cxx @@ -2,7 +2,7 @@ #include "BasicTask.hpp" #include "FinalizeTask.hpp" -#include +#include #include #include diff --git a/examples/cxx/autoDestination/Master.hpp b/examples/cxx/autoDestination/Master.hpp index 40bb39089a..b3e59ab7d6 100644 --- a/examples/cxx/autoDestination/Master.hpp +++ b/examples/cxx/autoDestination/Master.hpp @@ -1,7 +1,7 @@ #ifndef MASTER_HPP #define MASTER_HPP -#include +#include using namespace SimGrid::Msg; class Master : public Process diff --git a/examples/cxx/autoDestination/Slave.cxx b/examples/cxx/autoDestination/Slave.cxx index 74a74246a1..f0eb61151d 100644 --- a/examples/cxx/autoDestination/Slave.cxx +++ b/examples/cxx/autoDestination/Slave.cxx @@ -2,7 +2,7 @@ #include "FinalizeTask.hpp" #include "BasicTask.hpp" -#include +#include #include #include diff --git a/examples/cxx/autoDestination/Slave.hpp b/examples/cxx/autoDestination/Slave.hpp index 21c77a156e..1bb66a5236 100644 --- a/examples/cxx/autoDestination/Slave.hpp +++ b/examples/cxx/autoDestination/Slave.hpp @@ -1,7 +1,7 @@ #ifndef SLAVE_HPP #define SLAVE_HPP -#include +#include using namespace SimGrid::Msg; class Slave : public Process diff --git a/examples/cxx/basic/BasicTask.hpp b/examples/cxx/basic/BasicTask.hpp index 5dd3eabc7b..e4ecb0762a 100644 --- a/examples/cxx/basic/BasicTask.hpp +++ b/examples/cxx/basic/BasicTask.hpp @@ -1,7 +1,7 @@ #ifndef BASIC_TASK_HPP #define BASIC_TASK_HPP -#include +#include using namespace SimGrid::Msg; class BasicTask : public Task diff --git a/examples/cxx/basic/FinalizeTask.hpp b/examples/cxx/basic/FinalizeTask.hpp index 09baf42815..ad1b51e560 100644 --- a/examples/cxx/basic/FinalizeTask.hpp +++ b/examples/cxx/basic/FinalizeTask.hpp @@ -1,7 +1,7 @@ #ifndef FINALIZE_TASK_HPP #define FINALIZE_TASK_HPP -#include +#include using namespace SimGrid::Msg; class FinalizeTask : public Task diff --git a/examples/cxx/basic/Forwarder.cxx b/examples/cxx/basic/Forwarder.cxx index 911ff4a83a..368a5e4cab 100644 --- a/examples/cxx/basic/Forwarder.cxx +++ b/examples/cxx/basic/Forwarder.cxx @@ -1,7 +1,7 @@ #include "Forwarder.hpp" #include "BasicTask.hpp" #include "FinalizeTask.hpp" -#include +#include #include #include diff --git a/examples/cxx/basic/Forwarder.hpp b/examples/cxx/basic/Forwarder.hpp index 767334bfe1..b09b821635 100644 --- a/examples/cxx/basic/Forwarder.hpp +++ b/examples/cxx/basic/Forwarder.hpp @@ -1,7 +1,7 @@ #ifndef FORWARDER_HPP #define FORWARDER_HPP -#include +#include using namespace SimGrid::Msg; class Forwarder : public Process diff --git a/examples/cxx/basic/Main.cxx b/examples/cxx/basic/Main.cxx index 7de92928dd..ae7324bed5 100644 --- a/examples/cxx/basic/Main.cxx +++ b/examples/cxx/basic/Main.cxx @@ -1,4 +1,4 @@ -#include +#include using namespace SimGrid::Msg; diff --git a/examples/cxx/basic/Master.cxx b/examples/cxx/basic/Master.cxx index 51b5eb1255..9bf085eb4b 100644 --- a/examples/cxx/basic/Master.cxx +++ b/examples/cxx/basic/Master.cxx @@ -1,7 +1,7 @@ #include "Master.hpp" #include "BasicTask.hpp" #include "FinalizeTask.hpp" -#include +#include #include #include diff --git a/examples/cxx/basic/Master.hpp b/examples/cxx/basic/Master.hpp index 40bb39089a..b3e59ab7d6 100644 --- a/examples/cxx/basic/Master.hpp +++ b/examples/cxx/basic/Master.hpp @@ -1,7 +1,7 @@ #ifndef MASTER_HPP #define MASTER_HPP -#include +#include using namespace SimGrid::Msg; class Master : public Process diff --git a/examples/cxx/basic/Slave.cxx b/examples/cxx/basic/Slave.cxx index 3b9c5ea339..02f45aab5f 100644 --- a/examples/cxx/basic/Slave.cxx +++ b/examples/cxx/basic/Slave.cxx @@ -1,6 +1,6 @@ #include "Slave.hpp" #include "FinalizeTask.hpp" -#include +#include #include #include diff --git a/examples/cxx/basic/Slave.hpp b/examples/cxx/basic/Slave.hpp index 391e08d9b2..d0a5607bcd 100644 --- a/examples/cxx/basic/Slave.hpp +++ b/examples/cxx/basic/Slave.hpp @@ -1,7 +1,7 @@ #ifndef SLAVE_HPP #define SLAVE_HPP -#include +#include using namespace SimGrid::Msg; class Slave : public Process diff --git a/examples/cxx/comm_time/CommTimeTask.hpp b/examples/cxx/comm_time/CommTimeTask.hpp index 12769d2375..87a6eeade6 100644 --- a/examples/cxx/comm_time/CommTimeTask.hpp +++ b/examples/cxx/comm_time/CommTimeTask.hpp @@ -1,7 +1,7 @@ #ifndef COMMTIME_TASK_HPP #define COMMTIME_TASK_HPP -#include +#include using namespace SimGrid::Msg; class CommTimeTask : public Task diff --git a/examples/cxx/comm_time/FinalizeTask.hpp b/examples/cxx/comm_time/FinalizeTask.hpp index 2e29015880..162169d424 100644 --- a/examples/cxx/comm_time/FinalizeTask.hpp +++ b/examples/cxx/comm_time/FinalizeTask.hpp @@ -1,7 +1,7 @@ #ifndef FINALIZE_TASK_HPP #define FINALIZE_TASK_HPP -#include +#include using namespace SimGrid::Msg; class FinalizeTask : public Task diff --git a/examples/cxx/comm_time/Main.cxx b/examples/cxx/comm_time/Main.cxx index b286b71548..60dae829d2 100644 --- a/examples/cxx/comm_time/Main.cxx +++ b/examples/cxx/comm_time/Main.cxx @@ -1,4 +1,4 @@ -#include +#include using namespace SimGrid::Msg; diff --git a/examples/cxx/comm_time/Master.cxx b/examples/cxx/comm_time/Master.cxx index 3b510d13af..6eee1bb3c5 100644 --- a/examples/cxx/comm_time/Master.cxx +++ b/examples/cxx/comm_time/Master.cxx @@ -1,7 +1,7 @@ #include "Master.hpp" #include "CommTimeTask.hpp" #include "FinalizeTask.hpp" -#include +#include #include #include diff --git a/examples/cxx/comm_time/Master.hpp b/examples/cxx/comm_time/Master.hpp index 40bb39089a..b3e59ab7d6 100644 --- a/examples/cxx/comm_time/Master.hpp +++ b/examples/cxx/comm_time/Master.hpp @@ -1,7 +1,7 @@ #ifndef MASTER_HPP #define MASTER_HPP -#include +#include using namespace SimGrid::Msg; class Master : public Process diff --git a/examples/cxx/comm_time/Slave.cxx b/examples/cxx/comm_time/Slave.cxx index bc97e99284..c604f41c96 100644 --- a/examples/cxx/comm_time/Slave.cxx +++ b/examples/cxx/comm_time/Slave.cxx @@ -1,7 +1,7 @@ #include "Slave.hpp" #include "FinalizeTask.hpp" #include "CommTimeTask.hpp" -#include +#include #include #include @@ -30,7 +30,7 @@ int Slave::main(int argc, char** argv) if(time1 < task->getTime()) time1 = task->getTime(); - info(TEXT_("Processing \"") + TEXT_(task->getName()) + TEXT_("\" ") + TEXT_(getHost().getName()) + TEXT_(" (Communication time : ") + TEXT_((time2 - time1)) + TEXT_(")")); + //info(TEXT_("Processing \"") + TEXT_(task->getName()) + TEXT_("\" ") + TEXT_(getHost().getName()) + TEXT_(" (Communication time : ") + TEXT_((time2 - time1)) + TEXT_(")")); task->execute(); diff --git a/examples/cxx/comm_time/Slave.hpp b/examples/cxx/comm_time/Slave.hpp index c3e861b4fc..9ec76bc1c0 100644 --- a/examples/cxx/comm_time/Slave.hpp +++ b/examples/cxx/comm_time/Slave.hpp @@ -1,7 +1,7 @@ #ifndef SLAVE_HPP #define SLAVE_HPP -#include +#include using namespace SimGrid::Msg; class Slave : public Process diff --git a/examples/cxx/explicitDestination/BasicTask.hpp b/examples/cxx/explicitDestination/BasicTask.hpp index 01093d7ef3..4d5a728b56 100644 --- a/examples/cxx/explicitDestination/BasicTask.hpp +++ b/examples/cxx/explicitDestination/BasicTask.hpp @@ -1,7 +1,7 @@ #ifndef BASIC_TASK_HPP #define BASIC_TASK_HPP -#include +#include using namespace SimGrid::Msg; class BasicTask : public Task diff --git a/examples/cxx/explicitDestination/FinalizeTask.hpp b/examples/cxx/explicitDestination/FinalizeTask.hpp index 53c75db7f2..cda3683b36 100644 --- a/examples/cxx/explicitDestination/FinalizeTask.hpp +++ b/examples/cxx/explicitDestination/FinalizeTask.hpp @@ -1,7 +1,7 @@ #ifndef FINALIZE_TASK_HPP #define FINALIZE_TASK_HPP -#include +#include using namespace SimGrid::Msg; class FinalizeTask : public Task diff --git a/examples/cxx/explicitDestination/Forwarder.cxx b/examples/cxx/explicitDestination/Forwarder.cxx index 651533a11b..360db88bd1 100644 --- a/examples/cxx/explicitDestination/Forwarder.cxx +++ b/examples/cxx/explicitDestination/Forwarder.cxx @@ -2,7 +2,7 @@ #include "BasicTask.hpp" #include "FinalizeTask.hpp" -#include +#include #include #include diff --git a/examples/cxx/explicitDestination/Forwarder.hpp b/examples/cxx/explicitDestination/Forwarder.hpp index 767334bfe1..b09b821635 100644 --- a/examples/cxx/explicitDestination/Forwarder.hpp +++ b/examples/cxx/explicitDestination/Forwarder.hpp @@ -1,7 +1,7 @@ #ifndef FORWARDER_HPP #define FORWARDER_HPP -#include +#include using namespace SimGrid::Msg; class Forwarder : public Process diff --git a/examples/cxx/explicitDestination/Main.cxx b/examples/cxx/explicitDestination/Main.cxx index 696bdc2dfd..cf27e28bb6 100644 --- a/examples/cxx/explicitDestination/Main.cxx +++ b/examples/cxx/explicitDestination/Main.cxx @@ -1,4 +1,4 @@ -#include +#include using namespace SimGrid::Msg; diff --git a/examples/cxx/explicitDestination/Master.cxx b/examples/cxx/explicitDestination/Master.cxx index c436a29ffd..33f1626965 100644 --- a/examples/cxx/explicitDestination/Master.cxx +++ b/examples/cxx/explicitDestination/Master.cxx @@ -2,7 +2,7 @@ #include "BasicTask.hpp" #include "FinalizeTask.hpp" -#include +#include #include #include diff --git a/examples/cxx/explicitDestination/Master.hpp b/examples/cxx/explicitDestination/Master.hpp index 40bb39089a..b3e59ab7d6 100644 --- a/examples/cxx/explicitDestination/Master.hpp +++ b/examples/cxx/explicitDestination/Master.hpp @@ -1,7 +1,7 @@ #ifndef MASTER_HPP #define MASTER_HPP -#include +#include using namespace SimGrid::Msg; class Master : public Process diff --git a/examples/cxx/explicitDestination/Slave.cxx b/examples/cxx/explicitDestination/Slave.cxx index 6bd3dd6285..03c14c6bae 100644 --- a/examples/cxx/explicitDestination/Slave.cxx +++ b/examples/cxx/explicitDestination/Slave.cxx @@ -2,7 +2,7 @@ #include "FinalizeTask.hpp" #include "BasicTask.hpp" -#include +#include #include #include diff --git a/examples/cxx/explicitDestination/Slave.hpp b/examples/cxx/explicitDestination/Slave.hpp index 391e08d9b2..d0a5607bcd 100644 --- a/examples/cxx/explicitDestination/Slave.hpp +++ b/examples/cxx/explicitDestination/Slave.hpp @@ -1,7 +1,7 @@ #ifndef SLAVE_HPP #define SLAVE_HPP -#include +#include using namespace SimGrid::Msg; class Slave : public Process diff --git a/examples/cxx/ping_pong/Main.cxx b/examples/cxx/ping_pong/Main.cxx index ee113ef517..c9709012f5 100644 --- a/examples/cxx/ping_pong/Main.cxx +++ b/examples/cxx/ping_pong/Main.cxx @@ -1,4 +1,4 @@ -#include +#include using namespace SimGrid::Msg; diff --git a/examples/cxx/ping_pong/PingPongTask.hpp b/examples/cxx/ping_pong/PingPongTask.hpp index 405c1cba67..009429dfae 100644 --- a/examples/cxx/ping_pong/PingPongTask.hpp +++ b/examples/cxx/ping_pong/PingPongTask.hpp @@ -1,7 +1,7 @@ #ifndef PINGPONG_TASK_HPP #define PINGPONG_TASK_HPP -#include +#include using namespace SimGrid::Msg; class PingPongTask : public Task diff --git a/examples/cxx/ping_pong/Receiver.cxx b/examples/cxx/ping_pong/Receiver.cxx index cf58070e0d..01471228c9 100644 --- a/examples/cxx/ping_pong/Receiver.cxx +++ b/examples/cxx/ping_pong/Receiver.cxx @@ -1,6 +1,6 @@ #include "Receiver.hpp" #include "PingPongTask.hpp" -#include +#include #include #include diff --git a/examples/cxx/ping_pong/Receiver.hpp b/examples/cxx/ping_pong/Receiver.hpp index e4af2de025..13459734c9 100644 --- a/examples/cxx/ping_pong/Receiver.hpp +++ b/examples/cxx/ping_pong/Receiver.hpp @@ -1,7 +1,7 @@ #ifndef RECEIVER_HPP #define RECEIVER_HPP -#include +#include using namespace SimGrid::Msg; class Receiver : public Process diff --git a/examples/cxx/ping_pong/Sender.cxx b/examples/cxx/ping_pong/Sender.cxx index 41cbd7bc54..e5d79686ad 100644 --- a/examples/cxx/ping_pong/Sender.cxx +++ b/examples/cxx/ping_pong/Sender.cxx @@ -1,6 +1,6 @@ #include "Sender.hpp" #include "PingPongTask.hpp" -#include +#include #include #include @@ -41,7 +41,7 @@ int Sender::main(int argc, char** argv) for (int pos = 0; pos < hostCount; pos++) { time = getClock(); - + info(TEXT_("Sender time : ") + TEXT_(time)); task = new PingPongTask("no name",computeDuration,commSizeLat); diff --git a/examples/cxx/ping_pong/Sender.hpp b/examples/cxx/ping_pong/Sender.hpp index 0c7a647b3e..ae73a7d8a7 100644 --- a/examples/cxx/ping_pong/Sender.hpp +++ b/examples/cxx/ping_pong/Sender.hpp @@ -1,7 +1,7 @@ #ifndef SENDER_HPP #define SENDER_HPP -#include +#include using namespace SimGrid::Msg; class Sender : public Process diff --git a/examples/cxx/suspend/DreamMaster.cxx b/examples/cxx/suspend/DreamMaster.cxx index aac7b71ebd..a4e58b32a7 100644 --- a/examples/cxx/suspend/DreamMaster.cxx +++ b/examples/cxx/suspend/DreamMaster.cxx @@ -1,6 +1,6 @@ #include "DreamMaster.hpp" #include "LazyGuy.hpp" -#include +#include #include #include diff --git a/examples/cxx/suspend/DreamMaster.hpp b/examples/cxx/suspend/DreamMaster.hpp index f4c47b8ded..aee6f2b465 100644 --- a/examples/cxx/suspend/DreamMaster.hpp +++ b/examples/cxx/suspend/DreamMaster.hpp @@ -1,7 +1,7 @@ #ifndef DREAMMASTER_HPP #define DREAMMASTER_HPP -#include +#include using namespace SimGrid::Msg; class DreamMaster : public Process diff --git a/examples/cxx/suspend/LazyGuy.cxx b/examples/cxx/suspend/LazyGuy.cxx index 0b390a9fff..c19db95719 100644 --- a/examples/cxx/suspend/LazyGuy.cxx +++ b/examples/cxx/suspend/LazyGuy.cxx @@ -1,5 +1,5 @@ #include "LazyGuy.hpp" -#include +#include #include diff --git a/examples/cxx/suspend/LazyGuy.hpp b/examples/cxx/suspend/LazyGuy.hpp index e7ffdcbeb0..edd278d94d 100644 --- a/examples/cxx/suspend/LazyGuy.hpp +++ b/examples/cxx/suspend/LazyGuy.hpp @@ -1,7 +1,7 @@ #ifndef LAZYGUY_HPP #define LAZYGUY_HPP -#include +#include using namespace SimGrid::Msg; class LazyGuy : public Process diff --git a/examples/cxx/suspend/Main.cxx b/examples/cxx/suspend/Main.cxx index 5cf20506fb..5a0ad56a51 100644 --- a/examples/cxx/suspend/Main.cxx +++ b/examples/cxx/suspend/Main.cxx @@ -1,4 +1,4 @@ -#include +#include using namespace SimGrid::Msg; -- 2.20.1