From 6c6021e01e381da64785b505c354cee14ff123d2 Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Fri, 22 Jul 2016 10:12:05 +0200
Subject: [PATCH] [s4u] Activity ought not to be copied

---
 include/simgrid/s4u/Activity.hpp | 3 +++
 src/s4u/s4u_actor.cpp            | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp
index fae7fb88fa..0b8d3032a2 100644
--- a/include/simgrid/s4u/Activity.hpp
+++ b/include/simgrid/s4u/Activity.hpp
@@ -33,6 +33,9 @@ protected:
   virtual ~Activity();
 
 public:
+  Activity(Activity const&) = delete;
+  Activity& operator=(Activity const&) = delete;
+
   /** Starts a previously created activity.
    *
    * This function is optional: you can call wait() even if you didn't call start()
diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index d8ad4a27d6..c53f54a211 100644
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -130,14 +130,14 @@ e_smx_state_t execute(double flops) {
 
 void* recv(Mailbox &chan) {
   void *res = nullptr;
-  Comm c = Comm::recv_init(chan);
+  Comm& c = Comm::recv_init(chan);
   c.setDstData(&res,sizeof(res));
   c.wait();
   return res;
 }
 
 void send(Mailbox &chan, void *payload, size_t simulatedSize) {
-  Comm c = Comm::send_init(chan);
+  Comm& c = Comm::send_init(chan);
   c.setRemains(simulatedSize);
   c.setSrcData(payload);
   // c.start() is optional.
-- 
2.20.1