From: Christian Heinrich <franz-christian.heinrich@inria.fr>
Date: Wed, 8 Jun 2016 21:26:36 +0000 (+0200)
Subject: [INCLUDES] NULL -> nullptr substitution.
X-Git-Tag: v3_14~1014
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/24b63c987b1baf4e2fc2f68b00bd21c980eb8d6e

[INCLUDES] NULL -> nullptr substitution.
---

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::pair<std::string, std::string>, std::vector<surf::Link*>*> 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<std::string, Storage*> *mounts = NULL; // caching
+  boost::unordered_map<std::string, Storage*> *mounts = nullptr; // caching
 
 public:
   // FIXME: these should be protected, but it leads to many errors