X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d372483508bbd9164c5492148fdfb847348669de..e6ca184e99d50d0ee8fe405a83ee5277e2ecfce6:/src/mc/ObjectInformation.cpp diff --git a/src/mc/ObjectInformation.cpp b/src/mc/ObjectInformation.cpp index 6418c0a45a..b4c585102e 100644 --- a/src/mc/ObjectInformation.cpp +++ b/src/mc/ObjectInformation.cpp @@ -4,6 +4,10 @@ /* 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 "src/mc/Frame.hpp" #include "src/mc/ObjectInformation.hpp" #include "src/mc/Variable.hpp" @@ -44,9 +48,9 @@ void *ObjectInformation::base_address() const return nullptr; void *result = this->start_exec; - if (this->start_rw != NULL && result > (void *) this->start_rw) + if (this->start_rw != nullptr && result > (void *) this->start_rw) result = this->start_rw; - if (this->start_ro != NULL && result > (void *) this->start_ro) + if (this->start_ro != nullptr && result > (void *) this->start_ro) result = this->start_ro; return result; } @@ -149,7 +153,7 @@ void ObjectInformation::remove_global_variable(const char* name) * name. * * \param var_name Name of the local variable (or parameter to ignore) - * \param subprogram_name Name of the subprogram fo ignore (NULL for any) + * \param subprogram_name Name of the subprogram fo ignore (nullptr for any) * \param subprogram (possibly inlined) Subprogram of the scope * \param scope Current scope */