X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3b7e5f4b4d7c87ee3e8827313ec966ea8fc8387..edada81d50549499871369f63a5ac01d652b283e:/include/simgrid/kernel/future.hpp

diff --git a/include/simgrid/kernel/future.hpp b/include/simgrid/kernel/future.hpp
index b41008eb64..b0be4b1e71 100644
--- a/include/simgrid/kernel/future.hpp
+++ b/include/simgrid/kernel/future.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016-2020. The SimGrid Team.
+/* Copyright (c) 2016-2021. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -329,7 +329,7 @@ public:
    */
   template <class F> auto then_no_unwrap(F continuation) -> Future<decltype(continuation(std::move(*this)))>
   {
-    typedef decltype(continuation(std::move(*this))) R;
+    using R = decltype(continuation(std::move(*this)));
     if (state_ == nullptr)
       throw std::future_error(std::future_errc::no_state);
     auto state = std::move(state_);
@@ -358,19 +358,16 @@ public:
    * @exception std::future_error no state is associated with the future
    */
   template <class F>
-  auto then(F continuation) -> typename std::enable_if<not is_future<decltype(continuation(std::move(*this)))>::value,
-                                                       Future<decltype(continuation(std::move(*this)))>>::type
+  auto then(F continuation) -> typename std::enable_if_t<not is_future<decltype(continuation(std::move(*this)))>::value,
+                                                         Future<decltype(continuation(std::move(*this)))>>
   {
     return this->then_no_unwrap(std::move(continuation));
   }
 
   /** Attach a continuation to this future (future chaining) */
-  template<class F>
-  auto then(F continuation)
-  -> typename std::enable_if<
-       is_future<decltype(continuation(std::move(*this)))>::value,
-       decltype(continuation(std::move(*this)))
-     >::type
+  template <class F>
+  auto then(F continuation) -> typename std::enable_if_t<is_future<decltype(continuation(std::move(*this)))>::value,
+                                                         decltype(continuation(std::move(*this)))>
   {
     return unwrap_future(this->then_no_unwrap(std::move(continuation)));
   }