Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / smpi / private.hpp

diff --git a/src/smpi/private.hpp b/src/smpi/private.hpp
index 3e60d85..a5c1aed 100644 (file)
--- a/src/smpi/private.hpp
+++ b/src/smpi/private.hpp
@@ -6,8 +6,9 @@
 #ifndef SMPI_PRIVATE_HPP
 #define SMPI_PRIVATE_HPP
 
-#include <unordered_map>
 #include "src/instr/instr_smpi.h"
+#include <unordered_map>
+#include <vector>
 
 /**
  * Get the address of the beginning of the memory page where addr is located.
@@ -17,11 +18,11 @@
  */
 #define TOPAGE(addr) (void *)(((unsigned long)(addr) / xbt_pagesize) * xbt_pagesize)
 
-#ifdef HAVE_PAPI
+#if HAVE_PAPI
 typedef 
     std::vector<std::pair</* counter name */std::string, /* counter value */long long>> papi_counter_t;
-XBT_PRIVATE papi_counter_t& smpi_process_counter_data();
-XBT_PRIVATE int smpi_process_event_set();
+XBT_PRIVATE papi_counter_t& smpi_process_papi_counters();
+XBT_PRIVATE int smpi_process_papi_event_set();
 #endif
 
 extern std::unordered_map<std::string, double> location2speedup;