Drop support for SimGrid version before 3.7.

diff --git a/hostdata.cpp b/hostdata.cpp
index 403e13c3ee710cc19626f2ba8e0aefdd358b3248..88ca6fde2f197305879f8dea66e86521b9a74d5a 100644 (file)
--- a/hostdata.cpp
+++ b/hostdata.cpp
@@ -19,14 +19,9 @@ void hostdata::create()
     using std::placeholders::_1;
     using std::placeholders::_2;
 
     using std::placeholders::_1;
     using std::placeholders::_2;
 

-#if SIMGRID_VERSION < MAKE_SIMGRID_VERSION(3, 7, 0)
-    int nhosts = MSG_get_host_number();
-    msg_host_t* host_list = MSG_get_host_table();
-#else // API changed with SG 3.7.0

     xbt_dynar_t host_dynar = MSG_hosts_as_dynar();
     int nhosts = xbt_dynar_length(host_dynar);
     msg_host_t* host_list = static_cast<msg_host_t*>(xbt_dynar_to_array(host_dynar));
     xbt_dynar_t host_dynar = MSG_hosts_as_dynar();
     int nhosts = xbt_dynar_length(host_dynar);
     msg_host_t* host_list = static_cast<msg_host_t*>(xbt_dynar_to_array(host_dynar));

-#endif

     // only sort hosts for automatically created deployment
     if (opt::auto_depl::enabled)
         std::sort(host_list, host_list + nhosts,
     // only sort hosts for automatically created deployment
     if (opt::auto_depl::enabled)
         std::sort(host_list, host_list + nhosts,

diff --git a/simgrid_features.h b/simgrid_features.h
index 4bcbb621ad367a4649e2dc7b81433274ee9eb3ff..00ff3a7b70bb2fcfed628b9d7aa1ae0e01f39946 100644 (file)
--- a/simgrid_features.h
+++ b/simgrid_features.h
@@ -3,19 +3,19 @@
 
 #include <simgrid_config.h>
 
 
 #include <simgrid_config.h>
 

-#if !defined(SIMGRID_VERSION) // ==================== SimGrid <= 3.5 === //
-#  error "Unsupported SimGrid version.  Need version > 3.5"
-#endif // ============================================================== //
+#if !defined(SIMGRID_VERSION) || SIMGRID_VERSION < 30700UL // == SG < 3.7 == //
+#  error "Unsupported SimGrid version.  Need version >= 3.7"
+#endif // ================================================================== //

 
 

-#if SIMGRID_VERSION < MAKE_SIMGRID_VERSION(3, 8, 0) // ==== SG < 3.8 === //
+#if SIMGRID_VERSION < 30800UL // ============================== SG < 3.8 === //

 #  define MSG_init(argc, argv) MSG_global_init(argc, argv)
 #  define msg_error_t   MSG_error_t
 #  define msg_host_t    m_host_t
 #  define msg_process_t m_process_t
 #  define msg_task_t    m_task_t
 #  define MSG_init(argc, argv) MSG_global_init(argc, argv)
 #  define msg_error_t   MSG_error_t
 #  define msg_host_t    m_host_t
 #  define msg_process_t m_process_t
 #  define msg_task_t    m_task_t

-#else // =============================================================== //
+#else // =================================================================== //

 #  define MSG_clean()   MSG_OK
 #  define MSG_clean()   MSG_OK

-#endif // ============================================================== //
+#endif // ================================================================== //

 
 #endif // !SIMGRID_FEATURES_H
 
 
 #endif // !SIMGRID_FEATURES_H