X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15af6f9bf88ff4bfdd0b8e87039e666ee092fbfe..c7d4536a8384832da2a1d7b9bb9109100aaa0eb2:/src/simix/smx_io.cpp diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp index c4a1033589..41a1ff352f 100644 --- a/src/simix/smx_io.cpp +++ b/src/simix/smx_io.cpp @@ -4,12 +4,17 @@ /* 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. */ +#include +#include +#include +#include + +#include + +#include + #include "src/surf/surf_interface.hpp" #include "smx_private.h" -#include "xbt/sysdep.h" -#include "xbt/log.h" -#include "xbt/dict.h" -#include "mc/mc.h" #include "src/simix/SynchroIo.hpp" @@ -20,7 +25,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io) * \brief Internal function to create a SIMIX storage. * \param name name of the storage to create * \param storage the SURF storage to encapsulate - * \param data some user data (may be NULL) + * \param data some user data (may be nullptr) */ smx_storage_t SIMIX_storage_create(const char *name, void *storage, void *data) { @@ -42,7 +47,7 @@ void SIMIX_storage_destroy(void *s) { smx_storage_priv_t storage = (smx_storage_priv_t) s; - xbt_assert((storage != NULL), "Invalid parameters"); + xbt_assert((storage != nullptr), "Invalid parameters"); if (storage->data) free(storage->data); @@ -289,7 +294,7 @@ void SIMIX_io_finish(smx_synchro_t synchro) simcall->issuer->context->iwannadie = 1; } - simcall->issuer->waiting_synchro = NULL; + simcall->issuer->waiting_synchro = nullptr; SIMIX_simcall_answer(simcall); }