X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d5b29830df70e823202e384a7655e4371193ecd7..1fc042e8bc9c51f9267fa1936deaebe59ae01ee7:/src/mc/checker/LivenessChecker.hpp diff --git a/src/mc/checker/LivenessChecker.hpp b/src/mc/checker/LivenessChecker.hpp index 2722fc5a37..160b77cb88 100644 --- a/src/mc/checker/LivenessChecker.hpp +++ b/src/mc/checker/LivenessChecker.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2015. The SimGrid Team. +/* Copyright (c) 2007-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -14,20 +14,17 @@ #include #include +#include "src/mc/checker/Checker.hpp" +#include "src/mc/mc_state.hpp" #include -#include #include -#include "src/mc/mc_state.h" -#include "src/mc/checker/Checker.hpp" - -SG_BEGIN_DECL() - -SG_END_DECL() +#include namespace simgrid { namespace mc { -struct XBT_PRIVATE Pair { +class XBT_PRIVATE Pair { +public: int num = 0; bool search_cycle = false; std::shared_ptr graph_state = nullptr; /* System state included */ @@ -44,11 +41,12 @@ struct XBT_PRIVATE Pair { Pair& operator=(Pair const&) = delete; }; -struct XBT_PRIVATE VisitedPair { - int num = 0; +class XBT_PRIVATE VisitedPair { +public: + int num; int other_num = 0; /* Dot output for */ std::shared_ptr graph_state = nullptr; /* System state included */ - xbt_automaton_state_t automaton_state = nullptr; + xbt_automaton_state_t automaton_state; std::shared_ptr> atomic_propositions; std::size_t heap_bytes_used = 0; int actors_count = 0;