activity::CommImpl: stick to our naming standards for the fields

[simgrid.git] / src / msg / msg_gos.cpp

diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp
index d393195..422ba8d 100644 (file)
--- a/src/msg/msg_gos.cpp
+++ b/src/msg/msg_gos.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -522,14 +522,10 @@ int MSG_comm_testany(xbt_dynar_t comms)
     status         = MSG_TIMEOUT;
   }
   catch (xbt_ex& e) {
-    switch (e.category) {
-      case network_error:
-        finished_index = e.value;
-        status = MSG_TRANSFER_FAILURE;
-        break;
-      default:
-        throw;
-    }
+    if (e.category != network_error)
+      throw;
+    finished_index = e.value;
+    status         = MSG_TRANSFER_FAILURE;
   }
 
   if (finished_index != -1) {
@@ -686,7 +682,7 @@ void MSG_comm_copy_data_from_SIMIX(smx_activity_t synchro, void* buff, size_t bu
   // notify the user callback if any
   if (msg_global->task_copy_callback) {
     msg_task_t task = static_cast<msg_task_t>(buff);
-    msg_global->task_copy_callback(task, comm->src_proc->ciface(), comm->dst_proc->ciface());
+    msg_global->task_copy_callback(task, comm->src_actor_->ciface(), comm->dst_actor_->ciface());
   }
 }
 
@@ -837,7 +833,7 @@ int MSG_task_listen_from(const char *alias)
   if (not comm)
     return -1;
 
-  return MSG_process_get_PID(static_cast<msg_task_t>(comm->src_buff)->simdata->sender);
+  return MSG_process_get_PID(static_cast<msg_task_t>(comm->src_buff_)->simdata->sender);
 }
 
 /**