From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Fri, 10 Mar 2017 09:45:09 +0000 (+0100)
Subject: fix build, and avoid (void*) cast
X-Git-Tag: v3_15~161
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ccd19ab2f63bde0e36b5cfcd4ba3e67e29317a6a

fix build, and avoid (void*) cast
---

diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt
index 00d01fda4a..05e0be26c9 100644
--- a/examples/s4u/CMakeLists.txt
+++ b/examples/s4u/CMakeLists.txt
@@ -12,7 +12,7 @@ set(tesh_files    ${tesh_files}                                       PARENT_SCO
 set(xml_files     ${xml_files}    ${CMAKE_CURRENT_SOURCE_DIR}/launching/deployment.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u_actions-comm_split_d.xml
                                   ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u_actions-comm_d.xml
-                                  ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/app-masterworker_d.xml      PARENT_SCOPE)
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/app-masterworker/s4u_app-masterworker_d.xml      PARENT_SCOPE)
 set(txt_files     ${txt_files}    ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u_actions-comm_split_p0.txt
                                   ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u_actions-comm_split_p1.txt
                                   ${CMAKE_CURRENT_SOURCE_DIR}/actions-comm/s4u_actions-comm.txt
diff --git a/examples/s4u/app-masterworker/s4u_app-masterworker.cpp b/examples/s4u/app-masterworker/s4u_app-masterworker.cpp
index 68342bd3c7..f9e0c1b3e2 100644
--- a/examples/s4u/app-masterworker/s4u_app-masterworker.cpp
+++ b/examples/s4u/app-masterworker/s4u_app-masterworker.cpp
@@ -42,7 +42,7 @@ public:
 
       /* - Send the task to the @ref worker */
       char* payload = bprintf("%f", comp_size);
-      simgrid::s4u::this_actor::send(mailbox, (void*)(payload), comm_size);
+      simgrid::s4u::this_actor::send(mailbox, payload, comm_size);
     }
 
     XBT_INFO("All tasks have been dispatched. Let's tell everybody the computation is over.");