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 git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
mc
/
mc_private.h
diff --git
a/src/mc/mc_private.h
b/src/mc/mc_private.h
index
0ef9cfb
..
a49d3e4
100644
(file)
--- a/
src/mc/mc_private.h
+++ b/
src/mc/mc_private.h
@@
-1,5
+1,4
@@
-/* Copyright (c) 2007-2015. 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. */
/* 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. */
@@
-33,12
+32,11
@@
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
-struct DerefAndCompareBy
NbProcesses
AndUsedHeap {
+struct DerefAndCompareBy
ActorsCount
AndUsedHeap {
template<class X, class Y>
bool operator()(X const& a, Y const& b)
{
template<class X, class Y>
bool operator()(X const& a, Y const& b)
{
- return std::make_pair(a->nb_processes, a->heap_bytes_used) <
- std::make_pair(b->nb_processes, b->heap_bytes_used);
+ return std::make_pair(a->actors_count, a->heap_bytes_used) < std::make_pair(b->actors_count, b->heap_bytes_used);
}
};
}
};