Repository: mesos Updated Branches: refs/heads/master 90415006d -> 0c21277b6
Revert "Allowed IP to be implicitly constructed from a u32 address." This reverts commit cdbd8bb18c9f43f84d4a17ad27346b7b6439d6d8. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0c21277b Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0c21277b Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0c21277b Branch: refs/heads/master Commit: 0c21277b6c5e3c171f48c109c747eee9bfd3d1e7 Parents: 9041500 Author: Jie Yu <yujie....@gmail.com> Authored: Tue Jun 17 14:42:09 2014 -0700 Committer: Jie Yu <yujie....@gmail.com> Committed: Tue Jun 17 14:42:09 2014 -0700 ---------------------------------------------------------------------- 3rdparty/libprocess/3rdparty/stout/include/stout/net.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/0c21277b/3rdparty/libprocess/3rdparty/stout/include/stout/net.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/net.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/net.hpp index 446ca75..97215af 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/net.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/net.hpp @@ -327,7 +327,7 @@ public: static Try<IP> fromAddressPrefix(uint32_t address, size_t prefix); // Constructs an IP with the given IP address (in host order). - /*implicit*/ IP(uint32_t _address) : address_(_address) {} + explicit IP(uint32_t _address) : address_(_address) {} // Returns the IP address (in host order). uint32_t address() const { return address_; }
