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
/
surf
/
trace_mgr.cpp
diff --git
a/src/surf/trace_mgr.cpp
b/src/surf/trace_mgr.cpp
index
2e2743f
..
944073f
100644
(file)
--- a/
src/surf/trace_mgr.cpp
+++ b/
src/surf/trace_mgr.cpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2004-2005, 2007, 2009-2014, 2016-2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2018. 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. */
@@
-145,7
+144,7
@@
double simgrid::trace_mgr::future_evt_set::next_date() const
return heap_.empty() ? -1.0 : heap_.top().first;
}
return heap_.empty() ? -1.0 : heap_.top().first;
}
-/** @brief Retrieves the next occurring event, or nullptr if none happens before
#
date */
+/** @brief Retrieves the next occurring event, or nullptr if none happens before date */
tmgr_trace_event_t simgrid::trace_mgr::future_evt_set::pop_leq(double date, double* value,
kernel::resource::Resource** resource)
{
tmgr_trace_event_t simgrid::trace_mgr::future_evt_set::pop_leq(double date, double* value,
kernel::resource::Resource** resource)
{