From 20dec2510773106d6ad98f5f3bfff0d3b2ab2872 Mon Sep 17 00:00:00 2001 From: degomme Date: Fri, 22 Jan 2016 12:47:30 +0100 Subject: [PATCH 1/1] fix compilation with jedule and limited by latency --- include/simgrid/jedule/jedule_sd_binding.h | 4 ++-- src/surf/maxmin.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/simgrid/jedule/jedule_sd_binding.h b/include/simgrid/jedule/jedule_sd_binding.h index 9803c5ce04..3855ef88f0 100644 --- a/include/simgrid/jedule/jedule_sd_binding.h +++ b/include/simgrid/jedule/jedule_sd_binding.h @@ -11,7 +11,7 @@ #include "simgrid/simdag.h" #ifdef HAVE_JEDULE - +SG_BEGIN_DECL() XBT_PUBLIC(void) jedule_log_sd_event(SD_task_t task); XBT_PUBLIC(void) jedule_setup_platform(void); @@ -23,7 +23,7 @@ XBT_PUBLIC(void) jedule_sd_cleanup(void); XBT_PUBLIC(void) jedule_sd_exit(void); XBT_PUBLIC(void) jedule_sd_dump(void); - +SG_END_DECL() #endif /* JEDULE_SD_BINDING_H_ */ diff --git a/src/surf/maxmin.cpp b/src/surf/maxmin.cpp index 3af832b7a0..c675ce0b26 100644 --- a/src/surf/maxmin.cpp +++ b/src/surf/maxmin.cpp @@ -946,7 +946,7 @@ XBT_INLINE lmm_constraint_t lmm_get_next_active_constraint(lmm_system_t } #ifdef HAVE_LATENCY_BOUND_TRACKING -XBT_INLINE int lmm_is_variable_limited_by_latency(lmm_variable_t var) +int lmm_is_variable_limited_by_latency(lmm_variable_t var) { return (double_equals(var->bound, var->value, var->bound*sg_maxmin_precision)); } -- 2.20.1