MailboxPtr looks like a smart pointer, but it's not. Kill it.

[simgrid.git] / examples / s4u / app-bittorrent / s4u-tracker.hpp

diff --git a/examples/s4u/app-bittorrent/s4u-tracker.hpp b/examples/s4u/app-bittorrent/s4u-tracker.hpp
index d167dc0..4755919 100644 (file)
--- a/examples/s4u/app-bittorrent/s4u-tracker.hpp
+++ b/examples/s4u/app-bittorrent/s4u-tracker.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2014, 2017. The SimGrid Team.
+/* Copyright (c) 2012-2019. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -12,13 +12,14 @@
 
 class TrackerQuery {
   int peer_id; // peer id
-  simgrid::s4u::MailboxPtr return_mailbox;
+  simgrid::s4u::Mailbox* return_mailbox;
+
 public:
-  explicit TrackerQuery(int peer_id, simgrid::s4u::MailboxPtr return_mailbox)
+  explicit TrackerQuery(int peer_id, simgrid::s4u::Mailbox* return_mailbox)
       : peer_id(peer_id), return_mailbox(return_mailbox){};
   ~TrackerQuery() = default;
   int getPeerId() { return peer_id; }
-  simgrid::s4u::MailboxPtr getReturnMailbox() { return return_mailbox; }
+  simgrid::s4u::Mailbox* getReturnMailbox() { return return_mailbox; }
 };
 
 class TrackerAnswer {
@@ -26,7 +27,8 @@ class TrackerAnswer {
   std::set<int>* peers; // the peer list the peer has asked for.
 public:
   explicit TrackerAnswer(int /*interval*/) /*: interval(interval)*/ { peers = new std::set<int>; }
-  TrackerAnswer(const TrackerAnswer&)                               = delete;
+  TrackerAnswer(const TrackerAnswer&)                                       = delete;
+  TrackerAnswer& operator=(const TrackerAnswer&) = delete;
   ~TrackerAnswer() { delete peers; };
   void addPeer(int peer) { peers->insert(peer); }
   std::set<int>* getPeers() { return peers; }
@@ -35,7 +37,7 @@ public:
 class Tracker {
   double deadline;
   RngStream stream;
-  simgrid::s4u::MailboxPtr mailbox;
+  simgrid::s4u::Mailbox* mailbox;
   std::set<int> known_peers;
 
 public: