X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d4dc697d017dc90d064827165eb4f924452aeb0d..c2184f1318115fcea2571f738e8359044bc78d42:/src/mc/mc_private.hpp diff --git a/src/mc/mc_private.hpp b/src/mc/mc_private.hpp index 09d17dcd54..b8d4f1b4cd 100644 --- a/src/mc/mc_private.hpp +++ b/src/mc/mc_private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -16,23 +16,19 @@ namespace simgrid { namespace mc { struct DerefAndCompareByActorsCountAndUsedHeap { - template - bool operator()(X const& a, Y const& b) + template bool operator()(X const& a, Y const& b) { return std::make_pair(a->actors_count, a->heap_bytes_used) < std::make_pair(b->actors_count, b->heap_bytes_used); } }; - } } -SG_BEGIN_DECL() - /********************************* MC Global **********************************/ XBT_PRIVATE void MC_init_dot_output(); -XBT_PRIVATE extern FILE *dot_output; +XBT_PRIVATE extern FILE* dot_output; XBT_PRIVATE void MC_show_deadlock(void); @@ -42,21 +38,17 @@ XBT_PRIVATE void MC_show_deadlock(void); #define MC_VERBOSE 1 /********************************** Miscellaneous **********************************/ - -SG_END_DECL() - namespace simgrid { namespace mc { -XBT_PRIVATE void find_object_address( - std::vector const& maps, simgrid::mc::ObjectInformation* result); +XBT_PRIVATE void find_object_address(std::vector const& maps, + simgrid::mc::ObjectInformation* result); XBT_PRIVATE int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc::Snapshot* s2); // Move is somewhere else (in the LivenessChecker class, in the Session class?): extern XBT_PRIVATE xbt_automaton_t property_automaton; - } }