From 24b63c987b1baf4e2fc2f68b00bd21c980eb8d6e Mon Sep 17 00:00:00 2001 From: Christian Heinrich Date: Wed, 8 Jun 2016 23:26:36 +0200 Subject: [PATCH] [INCLUDES] NULL -> nullptr substitution. --- include/simgrid/s4u/As.hpp | 4 ++-- include/simgrid/s4u/host.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/simgrid/s4u/As.hpp b/include/simgrid/s4u/As.hpp index 8e92e0426d..445424f164 100644 --- a/include/simgrid/s4u/As.hpp +++ b/include/simgrid/s4u/As.hpp @@ -53,8 +53,8 @@ public: protected: char *name_ = nullptr; - xbt_dict_t children_ = xbt_dict_new_homogeneous(NULL); // sub-ASes - xbt_dynar_t vertices_ = xbt_dynar_new(sizeof(char*),NULL); // our content, as known to our graph routing algorithm (maps vertexId -> vertex) + xbt_dict_t children_ = xbt_dict_new_homogeneous(nullptr); // sub-ASes + xbt_dynar_t vertices_ = xbt_dynar_new(sizeof(char*),nullptr); // our content, as known to our graph routing algorithm (maps vertexId -> vertex) std::map, std::vector*> bypassRoutes_; // srcName x dstName -> route diff --git a/include/simgrid/s4u/host.hpp b/include/simgrid/s4u/host.hpp index 3cec9864d0..3d741de67b 100644 --- a/include/simgrid/s4u/host.hpp +++ b/include/simgrid/s4u/host.hpp @@ -91,7 +91,7 @@ public: private: simgrid::xbt::string name_ = "noname"; - boost::unordered_map *mounts = NULL; // caching + boost::unordered_map *mounts = nullptr; // caching public: // FIXME: these should be protected, but it leads to many errors -- 2.20.1