Repository: mesos Updated Branches: refs/heads/master 5fbd65fbd -> ba37b1ae0
Windows: Fixed ambiguousity error in `process/owned.hpp`. Review: https://reviews.apache.org/r/39851/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ba37b1ae Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ba37b1ae Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ba37b1ae Branch: refs/heads/master Commit: ba37b1ae0b9014987986e600472b8c969db18eb0 Parents: 5fbd65f Author: Alex Clemmer <[email protected]> Authored: Mon Dec 14 15:56:11 2015 -0800 Committer: Joris Van Remoortere <[email protected]> Committed: Mon Dec 14 16:25:21 2015 -0800 ---------------------------------------------------------------------- 3rdparty/libprocess/include/process/owned.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/ba37b1ae/3rdparty/libprocess/include/process/owned.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/owned.hpp b/3rdparty/libprocess/include/process/owned.hpp index b6e8655..c1a04cc 100644 --- a/3rdparty/libprocess/include/process/owned.hpp +++ b/3rdparty/libprocess/include/process/owned.hpp @@ -117,7 +117,9 @@ T* Owned<T>::get() const if (data.get() == NULL) { return NULL; } else { - CHECK(data->t != NULL) << "This owned pointer has already been shared"; + // Static cast to avoid ambiguity in Visual Studio compiler. + CHECK(data->t != static_cast<T*>(NULL)) + << "This owned pointer has already been shared"; return data->t; }
