From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 6 Jun 2017 06:34:33 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3.16~149
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d1ce25d36729721b7d7eed0fa4425e401db8a092

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

d1ce25d36729721b7d7eed0fa4425e401db8a092
diff --cc src/kernel/activity/ActivityImpl.hpp
index 1a28a5ff07,af36c69bea..1496c41717
--- a/src/kernel/activity/ActivityImpl.hpp
+++ b/src/kernel/activity/ActivityImpl.hpp
@@@ -35,10 -46,6 +35,11 @@@ namespace activity 
      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};
    };