X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f2e52058267e8ba6e5c4da63653351395471935b..b3a756fa6fe08c4f377ce22d205ef5c1b28bd250:/src/mc/mc_request.h diff --git a/src/mc/mc_request.h b/src/mc/mc_request.h index 2fa08961aa..2672208d1c 100644 --- a/src/mc/mc_request.h +++ b/src/mc/mc_request.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. 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. */ @@ -7,8 +6,6 @@ #ifndef SIMGRID_MC_REQUEST_H #define SIMGRID_MC_REQUEST_H -#include - #include "src/simix/smx_private.h" namespace simgrid { @@ -22,7 +19,7 @@ enum class RequestType { XBT_PRIVATE bool request_depend(smx_simcall_t req1, smx_simcall_t req2); -XBT_PRIVATE char* request_to_string(smx_simcall_t req, int value, simgrid::mc::RequestType type); +XBT_PRIVATE std::string request_to_string(smx_simcall_t req, int value, simgrid::mc::RequestType type); XBT_PRIVATE bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx); @@ -30,9 +27,9 @@ XBT_PRIVATE bool request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx); * * This is true if the request associated with the process is ready. */ -XBT_PRIVATE bool process_is_enabled(smx_process_t process); +XBT_PRIVATE bool actor_is_enabled(smx_actor_t process); -XBT_PRIVATE char *request_get_dot_output(smx_simcall_t req, int value); +XBT_PRIVATE std::string request_get_dot_output(smx_simcall_t req, int value); } }