Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --combined examples/s4u/dht-chord/s4u_dht-chord.hpp
index a8c81eb,a63191f..7b64d2c
--- 1/examples/s4u/dht-chord/s4u_dht-chord.hpp
--- 2/examples/s4u/dht-chord/s4u_dht-chord.hpp
+++ b/examples/s4u/dht-chord/s4u_dht-chord.hpp
@@@ -1,5 -1,4 +1,4 @@@
- /* Copyright (c) 2016. The SimGrid Team.
- * All rights reserved.                                                     */
+ /* Copyright (c) 2016-2017. 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. */
@@@ -64,10 -63,7 +63,10 @@@ public
    int answer_id      = -1;            // answer (used by some types of messages)
    simgrid::s4u::MailboxPtr answer_to; // mailbox to send an answer to (if any)
  
 -  ChordMessage(e_message_type_t type) : type(type) { issuer_host_name = simgrid::s4u::this_actor::host()->name(); }
 +  explicit ChordMessage(e_message_type_t type) : type(type)
 +  {
 +    issuer_host_name = simgrid::s4u::this_actor::host()->name();
 +  }
  
    ~ChordMessage() = default;
  };
@@@ -123,7 -119,7 +122,7 @@@ public
        return;
      ChordMessage* message              = nullptr;
      void* data                         = nullptr;
-     double now                         = simgrid::s4u::Engine::instance()->getClock();
+     double now                         = simgrid::s4u::Engine::getClock();
      double next_stabilize_date         = start_time_ + PERIODIC_STABILIZE_DELAY;
      double next_fix_fingers_date       = start_time_ + PERIODIC_FIX_FINGERS_DELAY;
      double next_check_predecessor_date = start_time_ + PERIODIC_CHECK_PREDECESSOR_DELAY;