From b34a31b09919c02f620efe9974ff02f919778f78 Mon Sep 17 00:00:00 2001 From: "jrg@chromium.org" Date: Thu, 26 Jan 2012 00:33:23 +0000 Subject: Fix warnings (which are now errors) in the Android build. BUG=None TEST= Review URL: http://codereview.chromium.org/9288034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119155 0039d316-1c4b-4281-b951-d872f2087c98 --- net/base/address_list_unittest.cc | 4 ++-- net/base/host_resolver_impl_unittest.cc | 9 +++++---- net/base/net_util.cc | 2 ++ net/dns/async_host_resolver_unittest.cc | 3 ++- 4 files changed, 11 insertions(+), 7 deletions(-) (limited to 'net') diff --git a/net/base/address_list_unittest.cc b/net/base/address_list_unittest.cc index f34ffb5..3dda87a 100644 --- a/net/base/address_list_unittest.cc +++ b/net/base/address_list_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -324,7 +324,7 @@ TEST(AddressListTest, CreateFromIPAddressList) { for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) { ASSERT_TRUE(next_ai != NULL); EXPECT_EQ(tests[i].ai_family, next_ai->ai_family); - EXPECT_EQ(tests[i].ai_addrlen, next_ai->ai_addrlen); + EXPECT_EQ(tests[i].ai_addrlen, static_cast(next_ai->ai_addrlen)); char* ai_addr = reinterpret_cast(next_ai->ai_addr); int rv = memcmp(tests[i].in_addr, diff --git a/net/base/host_resolver_impl_unittest.cc b/net/base/host_resolver_impl_unittest.cc index af9adc8..7acf244 100644 --- a/net/base/host_resolver_impl_unittest.cc +++ b/net/base/host_resolver_impl_unittest.cc @@ -394,7 +394,7 @@ TEST_F(HostResolverImplTest, AsynchronousLookup) { const struct addrinfo* ainfo = addrlist.head(); EXPECT_EQ(static_cast(NULL), ainfo->ai_next); - EXPECT_EQ(sizeof(struct sockaddr_in), ainfo->ai_addrlen); + EXPECT_EQ(sizeof(struct sockaddr_in), static_cast(ainfo->ai_addrlen)); const struct sockaddr* sa = ainfo->ai_addr; const struct sockaddr_in* sa_in = (const struct sockaddr_in*) sa; @@ -564,7 +564,7 @@ TEST_F(HostResolverImplTest, NumericIPv4Address) { const struct addrinfo* ainfo = addrlist.head(); EXPECT_EQ(static_cast(NULL), ainfo->ai_next); - EXPECT_EQ(sizeof(struct sockaddr_in), ainfo->ai_addrlen); + EXPECT_EQ(sizeof(struct sockaddr_in), static_cast(ainfo->ai_addrlen)); const struct sockaddr* sa = ainfo->ai_addr; const struct sockaddr_in* sa_in = (const struct sockaddr_in*) sa; @@ -591,7 +591,8 @@ TEST_F(HostResolverImplTest, NumericIPv6Address) { const struct addrinfo* ainfo = addrlist.head(); EXPECT_EQ(static_cast(NULL), ainfo->ai_next); - EXPECT_EQ(sizeof(struct sockaddr_in6), ainfo->ai_addrlen); + EXPECT_EQ(sizeof(struct sockaddr_in6), + static_cast(ainfo->ai_addrlen)); const struct sockaddr* sa = ainfo->ai_addr; const struct sockaddr_in6* sa_in6 = (const struct sockaddr_in6*) sa; @@ -1552,7 +1553,7 @@ TEST_F(HostResolverImplTest, DisallowNonCachedResponses) { const struct addrinfo* ainfo = addrlist.head(); EXPECT_EQ(static_cast(NULL), ainfo->ai_next); - EXPECT_EQ(sizeof(struct sockaddr_in), ainfo->ai_addrlen); + EXPECT_EQ(sizeof(struct sockaddr_in), static_cast(ainfo->ai_addrlen)); const struct sockaddr* sa = ainfo->ai_addr; const struct sockaddr_in* sa_in = reinterpret_cast(sa); diff --git a/net/base/net_util.cc b/net/base/net_util.cc index 05115c9..b4f1e579 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -2041,6 +2041,8 @@ bool IPv6Supported() { // Another approach is implementing the similar feature by // java.net.NetworkInterface through JNI. NOTIMPLEMENTED(); + // so we don't get a 'defined but not used' warning/err + IPv6SupportResults(IPV6_GETIFADDRS_FAILED); return true; #elif defined(OS_POSIX) int test_socket = socket(AF_INET6, SOCK_STREAM, 0); diff --git a/net/dns/async_host_resolver_unittest.cc b/net/dns/async_host_resolver_unittest.cc index 576af73..be57d49 100644 --- a/net/dns/async_host_resolver_unittest.cc +++ b/net/dns/async_host_resolver_unittest.cc @@ -38,7 +38,8 @@ void VerifyAddressList(const std::vector& ip_addresses, for (std::vector::const_iterator i = ip_addresses.begin(); i != ip_addresses.end(); ++i, ainfo = ainfo->ai_next) { ASSERT_NE(static_cast(NULL), ainfo); - EXPECT_EQ(sizeof(struct sockaddr_in), ainfo->ai_addrlen); + EXPECT_EQ(sizeof(struct sockaddr_in), + static_cast(ainfo->ai_addrlen)); const struct sockaddr* sa = ainfo->ai_addr; const struct sockaddr_in* sa_in = (const struct sockaddr_in*) sa; -- cgit v1.1