Kill xbt_os_thread_atfork: tesh is not native but python now

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

diff --git a/include/xbt/future.hpp b/include/xbt/future.hpp
index be488ed..e0f51f8 100644 (file)
--- a/include/xbt/future.hpp
+++ b/include/xbt/future.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2018. The SimGrid Team.
+/* Copyright (c) 2015-2019. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -134,7 +134,7 @@ public:
         T value = std::move(value_);
         value_.~T();
         status_ = ResultStatus::invalid;
-        return std::move(value);
+        return value;
       }
       case ResultStatus::exception: {
         std::exception_ptr exception = std::move(exception_);
@@ -259,11 +259,6 @@ template <class P, class F> inline void set_promise(P& promise, F&& future)
 {
   fulfill_promise(promise, [&] { return std::forward<F>(future).get(); });
 }
-template <class P, class F>
-inline XBT_ATTRIB_DEPRECATED_v323("Please use xbt::set_promise()") void setPromise(P& promise, F&& future)
-{
-  fulfill_promise(promise, [&] { return std::forward<F>(future).get(); });
-}
 
 }
 }