From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Fri, 3 Jun 2016 11:55:54 +0000 (+0200)
Subject: [xbt] Fix s/nullptr_t/std::nullptr_t/
X-Git-Tag: v3_14~1056^2^2~1
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/30fc130fdb83edd3ab2837fa367c6bf45523220c

[xbt] Fix s/nullptr_t/std::nullptr_t/
---

diff --git a/include/xbt/future.hpp b/include/xbt/future.hpp
index 122d59093b..316f68f675 100644
--- a/include/xbt/future.hpp
+++ b/include/xbt/future.hpp
@@ -144,7 +144,7 @@ private:
 };
 
 template<>
-class Result<void> : public Result<nullptr_t>
+class Result<void> : public Result<std::nullptr_t>
 {
 public:
   void set_value()
@@ -153,7 +153,7 @@ public:
   }
   void get()
   {
-    Result<nullptr_t>::get();
+    Result<std::nullptr_t>::get();
   }
 };