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

[simgrid.git] / include / xbt / future.hpp

diff --git a/include/xbt/future.hpp b/include/xbt/future.hpp
index 7fdfb0b..316f68f 100644 (file)
--- a/include/xbt/future.hpp
+++ b/include/xbt/future.hpp
@@ -73,13 +73,13 @@ public:
     return *this;
   }
 
-  bool is_valid()
+  bool is_valid() const
   {
     return status_ != ResultStatus::invalid;
   }
   void reset()
   {
-    switch(status_) {
+    switch (status_) {
       case ResultStatus::invalid:
         break;
       case ResultStatus::value:
@@ -116,8 +116,9 @@ public:
    **/
   T get()
   {
-    switch(status_) {
+    switch (status_) {
       case ResultStatus::invalid:
+      default:
         throw std::logic_error("Invalid result");
       case ResultStatus::value: {
         T value = std::move(value_);
@@ -143,7 +144,7 @@ private:
 };
 
 template<>
-class Result<void> : public Result<nullptr_t>
+class Result<void> : public Result<std::nullptr_t>
 {
 public:
   void set_value()
@@ -152,7 +153,7 @@ public:
   }
   void get()
   {
-    Result<nullptr_t>::get();
+    Result<std::nullptr_t>::get();
   }
 };