Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
fix the C inclusion of simix.h, once again
authorMartin Quinson <martin.quinson@loria.fr>
Sat, 14 Jul 2018 17:50:18 +0000 (19:50 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Sat, 14 Jul 2018 17:50:18 +0000 (19:50 +0200)
include/simgrid/simix.h
teshsuite/xbt/cmdline/cmdline.c

index e6e9203..bef172b 100644 (file)
@@ -191,11 +191,13 @@ XBT_PUBLIC void SIMIX_comm_finish(smx_activity_t synchro);
 /******************************************************************************/
 
 /******************************* Host simcalls ********************************/
 /******************************************************************************/
 
 /******************************* Host simcalls ********************************/
+#ifdef __cplusplus
 XBT_PUBLIC smx_activity_t simcall_execution_start(std::string name, double flops_amount, double priority, double bound,
                                                   sg_host_t host);
 XBT_PUBLIC smx_activity_t simcall_execution_parallel_start(std::string name, int host_nb, sg_host_t* host_list,
                                                            double* flops_amount, double* bytes_amount, double rate,
                                                            double timeout);
 XBT_PUBLIC smx_activity_t simcall_execution_start(std::string name, double flops_amount, double priority, double bound,
                                                   sg_host_t host);
 XBT_PUBLIC smx_activity_t simcall_execution_parallel_start(std::string name, int host_nb, sg_host_t* host_list,
                                                            double* flops_amount, double* bytes_amount, double rate,
                                                            double timeout);
+#endif
 XBT_PUBLIC void simcall_execution_cancel(smx_activity_t execution);
 XBT_PUBLIC void simcall_execution_set_priority(smx_activity_t execution, double priority);
 XBT_PUBLIC void simcall_execution_set_bound(smx_activity_t execution, double bound);
 XBT_PUBLIC void simcall_execution_cancel(smx_activity_t execution);
 XBT_PUBLIC void simcall_execution_set_priority(smx_activity_t execution, double priority);
 XBT_PUBLIC void simcall_execution_set_bound(smx_activity_t execution, double bound);
index bda54bc..3faaa71 100644 (file)
@@ -4,6 +4,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/engine.h"
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/engine.h"
+#include "simgrid/simix.h" // we don't need it, but someone must check that this file is actually usable in plain C
 #include <xbt.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Logging specific to this test");
 #include <xbt.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Logging specific to this test");