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 framagit.org:simgrid/simgrid
[simgrid.git]
/
src
/
kernel
/
resource
/
Action.cpp
diff --git
a/src/kernel/resource/Action.cpp
b/src/kernel/resource/Action.cpp
index
7f6fa06
..
aa77074
100644
(file)
--- a/
src/kernel/resource/Action.cpp
+++ b/
src/kernel/resource/Action.cpp
@@
-245,5
+245,5
@@
Action* ActionHeap::pop()
}
} // namespace surf
-} // namespace
simgrid
+} // namespace
kernel
} // namespace simgrid