[s4u] s/ByName/by_name/

[simgrid.git] / examples / s4u / basic / s4u_basic.cpp

diff --git a/examples/s4u/basic/s4u_basic.cpp b/examples/s4u/basic/s4u_basic.cpp
index 678d16f..c1e3ca5 100644 (file)
--- a/examples/s4u/basic/s4u_basic.cpp
+++ b/examples/s4u/basic/s4u_basic.cpp
@@ -3,37 +3,36 @@
 /* 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 "simgrid/s4u.h"
+#include <xbt/sysdep.h>
 
-using namespace simgrid;
-using namespace s4u;
+#include "simgrid/s4u.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "a sample log category");
 
-class Worker : Actor {
+class Worker : simgrid::s4u::Actor {
 public:
-       Worker(const char*procname, Host *host,int argc, char **argv)
-                       : s4u::Actor(procname,host,argc,argv){}
+       Worker(const char*procname, simgrid::s4u::Host *host,int argc, char **argv)
+                       : simgrid::s4u::Actor(procname,host,argc,argv){}
 
        int main(int argc, char **argv) {
                XBT_INFO("Hello s4u, I'm ready to serve");
 
-               char *msg = (char*)recv(*Mailbox::byName("worker"));
+               char *msg = (char*)recv(*simgrid::s4u::Mailbox::byName("worker"));
                XBT_INFO("I received '%s'",msg);
                XBT_INFO("I'm done. See you.");
                return 1;
        }
 };
 
-class Master : Actor {
+class Master : simgrid::s4u::Actor {
 public:
-       Master(const char*procname, Host *host,int argc, char **argv)
+       Master(const char*procname, simgrid::s4u::Host *host,int argc, char **argv)
                        : Actor(procname,host,argc,argv){}
 
        int main(int argc, char **argv) {
                const char *msg = "GaBuZoMeu";
                XBT_INFO("Hello s4u, I have something to send");
-               send(*Mailbox::byName("worker"), xbt_strdup(msg), strlen(msg));
+               send(*simgrid::s4u::Mailbox::byName("worker"), xbt_strdup(msg), strlen(msg));
 
                XBT_INFO("I'm done. See you.");
                return 1;
@@ -42,11 +41,11 @@ public:
 
 
 int main(int argc, char **argv) {
-       Engine *e = new Engine(&argc,argv);
+       simgrid::s4u::Engine *e = new simgrid::s4u::Engine(&argc,argv);
        e->loadPlatform("../../platforms/two_hosts_platform.xml");
 
-       new Worker("worker", Host::byName("host0"), 0, NULL);
-       new Master("master", Host::byName("host1"), 0, NULL);
+       new Worker("worker", simgrid::s4u::Host::by_name("host0"), 0, NULL);
+       new Master("master", simgrid::s4u::Host::by_name("host1"), 0, NULL);
        e->run();
        return 0;
 }