Repository: mesos Updated Branches: refs/heads/master aa3cc2d27 -> 57ab82012
Used stout `result_of` rather than `std::result_of` for `jsonify`. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/57ab8201 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/57ab8201 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/57ab8201 Branch: refs/heads/master Commit: 57ab820127f54d70d9205d4ac0a89d3ec90a7016 Parents: aa3cc2d Author: Michael Park <[email protected]> Authored: Thu Jan 21 12:25:37 2016 -0800 Committer: Michael Park <[email protected]> Committed: Thu Jan 21 12:26:17 2016 -0800 ---------------------------------------------------------------------- 3rdparty/libprocess/3rdparty/stout/include/stout/jsonify.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/57ab8201/3rdparty/libprocess/3rdparty/stout/include/stout/jsonify.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/jsonify.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/jsonify.hpp index a87b9e2..addec8e 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/jsonify.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/jsonify.hpp @@ -21,6 +21,7 @@ #include <type_traits> #include <utility> +#include <stout/result_of.hpp> #include <stout/strings.hpp> // `jsonify` takes an instance of a C++ object and returns a light-weight proxy @@ -574,7 +575,7 @@ namespace internal { // `std::function` instead. // Given an `F` which is a "write" function, we simply use it directly. -template <typename F, typename = typename std::result_of<F(WriterProxy)>::type> +template <typename F, typename = typename result_of<F(WriterProxy)>::type> std::function<void(std::ostream*)> jsonify(const F& write, Prefer) { return [&write](std::ostream* stream) { write(WriterProxy(stream)); };
