You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2014/06/17 23:03:17 UTC

git commit: Allowed IP to be implicitly constructed from a u32 address.

Repository: mesos
Updated Branches:
  refs/heads/master 67b319044 -> cdbd8bb18


Allowed IP to be implicitly constructed from a u32 address.

Review: https://reviews.apache.org/r/22686


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/cdbd8bb1
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/cdbd8bb1
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/cdbd8bb1

Branch: refs/heads/master
Commit: cdbd8bb18c9f43f84d4a17ad27346b7b6439d6d8
Parents: 67b3190
Author: Chi Zhang <ch...@gmail.com>
Authored: Tue Jun 17 14:00:08 2014 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Jun 17 14:00:08 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/cdbd8bb1/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 97215af..446ca75 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).
-  explicit IP(uint32_t _address) : address_(_address) {}
+  /*implicit*/ IP(uint32_t _address) : address_(_address) {}
 
   // Returns the IP address (in host order).
   uint32_t address() const { return address_; }