Repository: mesos Updated Branches: refs/heads/master cbe704f44 -> c53de123a
Used stout `result_of` instead of `std::result_of` in `future.hpp`. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c53de123 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c53de123 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c53de123 Branch: refs/heads/master Commit: c53de123adcbe9668f7887052b86ec7477689f28 Parents: cbe704f Author: Michael Park <[email protected]> Authored: Thu Jan 21 16:22:15 2016 -0800 Committer: Michael Park <[email protected]> Committed: Thu Jan 21 16:48:31 2016 -0800 ---------------------------------------------------------------------- 3rdparty/libprocess/include/process/future.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/c53de123/3rdparty/libprocess/include/process/future.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/future.hpp b/3rdparty/libprocess/include/process/future.hpp index 80f3a39..77655f2 100644 --- a/3rdparty/libprocess/include/process/future.hpp +++ b/3rdparty/libprocess/include/process/future.hpp @@ -226,11 +226,11 @@ private: // out this version of `onReady` and force the use of the preferred `onReady` // (which works because `std::bind` will just ignore the `const T&` argument). // This is necessary because Visual Studio 2015 doesn't support using the - // `std::bind` call operator with `std::result_of` as it's technically not a + // `std::bind` call operator with `result_of` as it's technically not a // requirement by the C++ standard. template < typename F, - typename = typename std::result_of<typename std::enable_if< + typename = typename result_of<typename std::enable_if< !std::is_bind_expression<typename std::decay<F>::type>::value, F>::type()>::type> const Future<T>& onReady(F&& f, LessPrefer) const @@ -254,7 +254,7 @@ private: // conditions are necessary. template < typename F, - typename = typename std::result_of<typename std::enable_if< + typename = typename result_of<typename std::enable_if< !std::is_bind_expression<typename std::decay<F>::type>::value, F>::type()>::type> const Future<T>& onFailed(F&& f, LessPrefer) const @@ -278,7 +278,7 @@ private: // conditions are necessary. template < typename F, - typename = typename std::result_of<typename std::enable_if< + typename = typename result_of<typename std::enable_if< !std::is_bind_expression<typename std::decay<F>::type>::value, F>::type()>::type> const Future<T>& onAny(F&& f, LessPrefer) const @@ -364,7 +364,7 @@ private: template < typename F, typename X = typename internal::unwrap< - typename std::result_of<typename std::enable_if< + typename result_of<typename std::enable_if< !std::is_bind_expression<typename std::decay<F>::type>::value, F>::type()>::type>::type> Future<X> then(_Deferred<F>&& f, LessPrefer) const @@ -383,7 +383,7 @@ private: template < typename F, typename X = typename internal::unwrap< - typename std::result_of<typename std::enable_if< + typename result_of<typename std::enable_if< !std::is_bind_expression<typename std::decay<F>::type>::value, F>::type()>::type>::type> Future<X> then(F&& f, LessPrefer) const
