Merge branch 'master' into 'master'

[simgrid.git] / src / mc / mc_private.hpp

diff --git a/src/mc/mc_private.hpp b/src/mc/mc_private.hpp
index 3feeed9..d8455b9 100644 (file)
--- a/src/mc/mc_private.hpp
+++ b/src/mc/mc_private.hpp
@@ -16,7 +16,7 @@ namespace simgrid {
 namespace mc {
 
 struct DerefAndCompareByActorsCountAndUsedHeap {
-  template <class X, class Y> bool operator()(X const& a, Y const& b)
+  template <class X, class Y> bool operator()(X const& a, Y const& b) const
   {
     return std::make_pair(a->actors_count, a->heap_bytes_used) < std::make_pair(b->actors_count, b->heap_bytes_used);
   }
@@ -30,7 +30,7 @@ XBT_PRIVATE void MC_init_dot_output();
 
 XBT_PRIVATE extern FILE* dot_output;
 
-XBT_PRIVATE void MC_show_deadlock(void);
+XBT_PRIVATE void MC_show_deadlock();
 
 /********************************** Miscellaneous **********************************/
 namespace simgrid {