Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
[mc] Remove usage of boost::iterator_range
authorGabriel Corona <gabriel.corona@loria.fr>
Thu, 3 Mar 2016 17:15:10 +0000 (18:15 +0100)
committerGabriel Corona <gabriel.corona@loria.fr>
Thu, 3 Mar 2016 17:36:56 +0000 (18:36 +0100)
Just use the container now that we use C++ containers.

src/mc/Process.cpp
src/mc/Process.hpp
src/mc/mc_smx.h

index 8ae6fff..5360933 100644 (file)
@@ -698,13 +698,11 @@ void Process::ignore_local_variable(const char *var_name, const char *frame_name
     info->remove_local_variable(var_name, frame_name);
 }
 
-boost::iterator_range<simgrid::mc::SimixProcessInformation*> Process::simix_processes()
+std::vector<simgrid::mc::SimixProcessInformation>& Process::simix_processes()
 {
   xbt_assert(mc_mode != MC_MODE_CLIENT);
   MC_process_smx_refresh(&mc_model_checker->process());
-  return boost::iterator_range<simgrid::mc::SimixProcessInformation*>(
-    &*smx_process_infos.begin(),
-    &*smx_process_infos.end());
+  return smx_process_infos;
 }
 
 }
index aa93404..724d068 100644 (file)
 #include <vector>
 #include <memory>
 
-#include <boost/range/iterator_range.hpp>
-
 #include <sys/types.h>
 
 #include <simgrid_config.h>
 
 #include <xbt/base.h>
 #include <xbt/dynar.h>
-#include <xbt/dynar.hpp>
 #include <xbt/mmalloc.h>
 
 #ifdef HAVE_MC
@@ -217,7 +214,7 @@ public:
 
   void ignore_local_variable(const char *var_name, const char *frame_name);
   int socket() { return socket_; }
-  simgrid::xbt::DynarRange<simgrid::mc::SimixProcessInformation> simix_processes();
+  std::vector<simgrid::mc::SimixProcessInformation>& simix_processes();
 
 private:
   void init_memory_map_info();
index d83a73e..cecce1b 100644 (file)
@@ -11,7 +11,6 @@
 
 #include <xbt/base.h>
 #include <xbt/dynar.h>
-#include <xbt/dynar.hpp>
 #include <xbt/log.h>
 
 #include <simgrid/simix.h>