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 commit '045db1657e870c721be490b411868f4181a12ced' into surf++
[simgrid.git]
/
src
/
include
/
surf
/
surf_resource_lmm.h
diff --git
a/src/include/surf/surf_resource_lmm.h
b/src/include/surf/surf_resource_lmm.h
index
44bfeaf
..
4be9408
100644
(file)
--- a/
src/include/surf/surf_resource_lmm.h
+++ b/
src/include/surf/surf_resource_lmm.h
@@
-11,7
+11,7
@@
#include "surf/trace_mgr.h"
#include "surf/surf_resource.h"
#include "surf/trace_mgr.h"
#include "surf/surf_resource.h"
-
+#ifdef TOMATO
static XBT_INLINE
surf_resource_lmm_t surf_resource_lmm_new(size_t childsize,
/* for superclass */
static XBT_INLINE
surf_resource_lmm_t surf_resource_lmm_new(size_t childsize,
/* for superclass */
@@
-43,7
+43,7
@@
static XBT_INLINE
tmgr_history_add_trace(history, metric_trace, 0.0, 0, res);
return res;
}
tmgr_history_add_trace(history, metric_trace, 0.0, 0, res);
return res;
}
-
+#endif
static XBT_INLINE e_surf_resource_state_t surf_resource_lmm_get_state(void
*r)
static XBT_INLINE e_surf_resource_state_t surf_resource_lmm_get_state(void
*r)