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
Move simgrid::xbt::HeapComparator in xbt/utility.hpp.
[simgrid.git]
/
src
/
surf
/
surf_interface.cpp
diff --git
a/src/surf/surf_interface.cpp
b/src/surf/surf_interface.cpp
index
632776c
..
42b8448
100644
(file)
--- a/
src/surf/surf_interface.cpp
+++ b/
src/surf/surf_interface.cpp
@@
-774,7
+774,7
@@
bool Action::isSuspended()
void Action::heapInsert(heap_type& heap, double key, enum heap_action_type hat)
{
hat_ = hat;
void Action::heapInsert(heap_type& heap, double key, enum heap_action_type hat)
{
hat_ = hat;
- heapHandle_ = heap.emplace(
key, this
);
+ heapHandle_ = heap.emplace(
std::make_pair(key, this)
);
}
void Action::heapRemove(heap_type& heap)
}
void Action::heapRemove(heap_type& heap)
@@
-792,7
+792,7
@@
void Action::heapUpdate(heap_type& heap, double key, enum heap_action_type hat)
if (heapHandle_) {
heap.update(*heapHandle_, std::make_pair(key, this));
} else {
if (heapHandle_) {
heap.update(*heapHandle_, std::make_pair(key, this));
} else {
- heapHandle_ = heap.emplace(
key, this
);
+ heapHandle_ = heap.emplace(
std::make_pair(key, this)
);
}
}
}
}