A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
kernel
/
activity
/
ActivityImpl.hpp
diff --git
a/src/kernel/activity/ActivityImpl.hpp
b/src/kernel/activity/ActivityImpl.hpp
index
e144296
..
1496c41
100644
(file)
--- a/
src/kernel/activity/ActivityImpl.hpp
+++ b/
src/kernel/activity/ActivityImpl.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-201
6
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-201
7
. 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. */
/* 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,22
+31,15
@@
namespace activity {
virtual void resume()=0;
virtual void post() =0; // What to do when a simcall terminates
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();
/** @brief Increases the refcount */
void ref();
/** @brief Reduces the refcount */
void unref();
+ // 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};
};
private:
std::atomic_int_fast32_t refcount_{1};
};