From 25ada1b3a5e1a439e4f2468094c3397f78fe9471 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 8 Feb 2011 11:35:25 +0100 Subject: [PATCH 1/1] No return value for communicator::receiver(). --- communicator.cpp | 7 +++---- communicator.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/communicator.cpp b/communicator.cpp index 89cece6..1da6def 100644 --- a/communicator.cpp +++ b/communicator.cpp @@ -155,7 +155,7 @@ int communicator::receiver_wrapper(int, char* []) { communicator* comm; comm = static_cast(MSG_process_get_data(MSG_process_self())); - int result = comm->receiver(); + comm->receiver(); XBT_DEBUG("terminate"); xbt_mutex_acquire(comm->receiver_mutex); @@ -163,7 +163,7 @@ int communicator::receiver_wrapper(int, char* []) xbt_cond_signal(comm->receiver_cond); xbt_mutex_release(comm->receiver_mutex); - return result; + return 0; } void communicator::receiver1(msg_comm_t& comm, m_task_t& task, const char* mbox) @@ -185,7 +185,7 @@ void communicator::receiver1(msg_comm_t& comm, m_task_t& task, const char* mbox) } } -int communicator::receiver() +void communicator::receiver() { ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox()); data_comm = MSG_task_irecv(&data_task, get_data_mbox()); @@ -213,7 +213,6 @@ int communicator::receiver() THROW1(0, 0, "Cannot handle unknown comm -- %p", finished_comm); } xbt_dynar_free(&comms); - return 0; } // Local variables: diff --git a/communicator.h b/communicator.h index cae340c..efd0fb7 100644 --- a/communicator.h +++ b/communicator.h @@ -69,7 +69,7 @@ private: m_process_t receiver_thread; static int receiver_wrapper(int, char* []); void receiver1(msg_comm_t& comm, m_task_t& task, const char* mbox); - int receiver(); + void receiver(); // Used to test if a communication is over, and to destroy it if it is static bool comm_test_n_destroy(msg_comm_t comm); -- 2.39.5