Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
fix compilation with jedule and limited by latency
authordegomme <augustin.degomme@unibas.ch>
Fri, 22 Jan 2016 11:47:30 +0000 (12:47 +0100)
committerdegomme <augustin.degomme@unibas.ch>
Fri, 22 Jan 2016 11:53:29 +0000 (12:53 +0100)
include/simgrid/jedule/jedule_sd_binding.h
src/surf/maxmin.cpp

index 9803c5c..3855ef8 100644 (file)
@@ -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_ */
 
 
index 3af832b..c675ce0 100644 (file)
@@ -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));
 }