Manually merged d9e90d7048a3598924f929540702fbf950524af0 from master

diff --git a/common/future.h b/common/future.h
index 2e15796756480883d2ca5fa3edb45b20ed428799..1a07026b3785afb0eb9602ba4c7feb7ea7bb9d2e 100644 (file)
--- a/common/future.h
+++ b/common/future.h
@@ -250,7 +250,8 @@ public:
         * @param exception The exception to mark the future with *if* the task
         *                  completion fails.
         */
-       void try_or_fail(const std::exception& exception)
+       template <class E>
+       void try_or_fail(const E& exception)
        {
                boost::mutex::scoped_lock lock(mutex_);