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

diff --combined src/kernel/activity/ActivityImpl.hpp
index 1a28a5f,af36c69..1496c41
--- 1/src/kernel/activity/ActivityImpl.hpp
--- 2/src/kernel/activity/ActivityImpl.hpp
+++ b/src/kernel/activity/ActivityImpl.hpp
@@@ -1,4 -1,4 +1,4 @@@
 -/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
 +/* Copyright (c) 2007-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. */
@@@ -31,14 -31,21 +31,15 @@@ namespace activity 
      virtual void resume()=0;
      virtual void post() =0; // What to do when a simcall terminates
  
 -    // boost::intrusive_ptr<Activity> support:
 -    friend void intrusive_ptr_add_ref(ActivityImpl * activity)
 -    {
 -      activity->ref();
 -    }
 -
 -    friend void intrusive_ptr_release(ActivityImpl * activity)
 -    {
 -      activity->unref();
 -    }
 -
      /** @brief Increases the refcount */
      void ref();
      /** @brief Reduces the refcount */
      void unref();
-     // boost::intrusive_ptr<Activity> support:
++
++     // boost::intrusive_ptr<Activity> support:
 +    friend void intrusive_ptr_add_ref(ActivityImpl * activity);
 +    friend void intrusive_ptr_release(ActivityImpl * activity);
 +
    private:
      std::atomic_int_fast32_t refcount_{1};
    };