You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2017/07/05 19:27:16 UTC
[2/3] mesos git commit: Replaced use of `net::IPNetwork` by
`net::IP::Network` in stout.
Replaced use of `net::IPNetwork` by `net::IP::Network` in stout.
Review: https://reviews.apache.org/r/59739/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ec1f15e3
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ec1f15e3
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ec1f15e3
Branch: refs/heads/master
Commit: ec1f15e3acc07dbcfeadfe39fa0d252cbb46ba4e
Parents: 36b97ed
Author: Avinash sridharan <av...@mesosphere.io>
Authored: Wed Jul 5 11:39:31 2017 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Wed Jul 5 11:40:32 2017 -0700
----------------------------------------------------------------------
3rdparty/stout/include/stout/posix/ip.hpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ec1f15e3/3rdparty/stout/include/stout/posix/ip.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/stout/include/stout/posix/ip.hpp b/3rdparty/stout/include/stout/posix/ip.hpp
index 0d7e85a..3d654f4 100644
--- a/3rdparty/stout/include/stout/posix/ip.hpp
+++ b/3rdparty/stout/include/stout/posix/ip.hpp
@@ -27,7 +27,7 @@
namespace net {
-inline Result<IPNetwork> IPNetwork::fromLinkDevice(
+inline Result<IP::Network> IP::Network::fromLinkDevice(
const std::string& name,
int family)
{
@@ -56,7 +56,7 @@ inline Result<IPNetwork> IPNetwork::fromLinkDevice(
freeifaddrs(ifaddr);
- Try<IPNetwork> network = IPNetwork::create(address, netmask);
+ Try<IP::Network> network = IP::Network::create(address, netmask);
if (network.isError()) {
return Error(network.error());
}
@@ -71,7 +71,7 @@ inline Result<IPNetwork> IPNetwork::fromLinkDevice(
// default /32 prefix for IPv4 and /64 for IPv6 is used.
int prefix = (family == AF_INET ? 32 : 64);
- Try<IPNetwork> network = IPNetwork::create(address, prefix);
+ Try<IP::Network> network = IP::Network::create(address, prefix);
if (network.isError()) {
return Error(network.error());
}