Pull simgrid/master and a subsequent merge

[simgrid.git] / src / instr / instr_smpi.hpp

diff --git a/src/instr/instr_smpi.hpp b/src/instr/instr_smpi.hpp
index 910f702..e7aa343 100644 (file)
--- a/src/instr/instr_smpi.hpp
+++ b/src/instr/instr_smpi.hpp
@@ -11,7 +11,7 @@
 #include <string>
 
 /* Helper functions */
-XBT_PRIVATE container_t smpi_container(int rank);
+XBT_PRIVATE simgrid::instr::Container* smpi_container(int rank);
 XBT_PRIVATE void TRACE_smpi_setup_container(int rank, const_sg_host_t host);
 
 XBT_PRIVATE void TRACE_smpi_sleeping_out(int rank);
@@ -22,9 +22,6 @@ XBT_PRIVATE void TRACE_smpi_send(int rank, int src, int dst, int tag, int size);
 XBT_PRIVATE void TRACE_smpi_recv(int src, int dst, int tag);
 XBT_PRIVATE void TRACE_smpi_init(int rank, const std::string& calling_func);
 
-/* SMPI + LB (load balancer) */
-XBT_PRIVATE void TRACE_smpi_process_change_host(int rank, const_sg_host_t new_host);
-
 class smpi_trace_call_location_t {
 public:
   std::string filename;