No return value for communicator::receiver().

diff --git a/communicator.cpp b/communicator.cpp
index 89cece60b3656277659cf1f6b135ec6fccb7a5c2..1da6deffea6c2af314a36f0706f22fa1c82964f6 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -155,7 +155,7 @@ int communicator::receiver_wrapper(int, char* [])
 {
     communicator* comm;
     comm = static_cast<communicator*>(MSG_process_get_data(MSG_process_self()));
 {
     communicator* comm;
     comm = static_cast<communicator*>(MSG_process_get_data(MSG_process_self()));

-    int result = comm->receiver();
+    comm->receiver();

 
     XBT_DEBUG("terminate");
     xbt_mutex_acquire(comm->receiver_mutex);
 
     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);
 
     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)
 }
 
 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());
 {
     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);
             THROW1(0, 0, "Cannot handle unknown comm -- %p", finished_comm);
     }
     xbt_dynar_free(&comms);

-    return 0;

 }
 
 // Local variables:
 }
 
 // Local variables:

diff --git a/communicator.h b/communicator.h
index cae340c9c03f4376df9749e53013835a449f4df4..efd0fb759efb346131e0a6643b9912bd8f46da2f 100644 (file)
--- 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);
     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);
 
     // 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);