diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 04:27:19 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-04 04:27:19 +0000 |
| commit | f024f7900b966402d73c9516a9b7e6fe7e98684c (patch) | |
| tree | fae561da12e5cbab2df4412c35bd6b75a0a18a06 /net | |
| parent | 30cb7a44b47b8ec5ef9607ef65dcd6aead29bbe9 (diff) | |
| download | chromium_src-f024f7900b966402d73c9516a9b7e6fe7e98684c.zip chromium_src-f024f7900b966402d73c9516a9b7e6fe7e98684c.tar.gz chromium_src-f024f7900b966402d73c9516a9b7e6fe7e98684c.tar.bz2 | |
Mac: Some clang appeasing.
BUG=TEST=none
Review URL: http://codereview.chromium.org/3089004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54870 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/cookie_monster.cc | 2 | ||||
| -rw-r--r-- | net/base/mime_sniffer.cc | 3 | ||||
| -rw-r--r-- | net/http/http_auth_gssapi_posix.h | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/net/base/cookie_monster.cc b/net/base/cookie_monster.cc index 8b0f591..bd86772 100644 --- a/net/base/cookie_monster.cc +++ b/net/base/cookie_monster.cc @@ -1614,7 +1614,7 @@ CookieMonster::CanonicalCookie* CookieMonster::CanonicalCookie::Create( return NULL; std::string cookie_domain; if (!GetCookieDomainKeyWithString(url, parsed_domain, &cookie_domain)) - return false; + return NULL; std::string parsed_path = ParsedCookie::ParseValueString(path); if (parsed_path != path) diff --git a/net/base/mime_sniffer.cc b/net/base/mime_sniffer.cc index 1961107..4ad4e1d 100644 --- a/net/base/mime_sniffer.cc +++ b/net/base/mime_sniffer.cc @@ -228,7 +228,8 @@ static bool MatchMagicNumber(const char* content, size_t size, // pretend the length is content_size. const char* end = static_cast<const char*>(memchr(content, '\0', size)); - const size_t content_strlen = (end != NULL) ? (end - content) : size; + const size_t content_strlen = + (end != NULL) ? static_cast<size_t>(end - content) : size; bool match = false; if (magic_entry->is_string) { diff --git a/net/http/http_auth_gssapi_posix.h b/net/http/http_auth_gssapi_posix.h index 094a784..71ff555 100644 --- a/net/http/http_auth_gssapi_posix.h +++ b/net/http/http_auth_gssapi_posix.h @@ -20,7 +20,7 @@ class GURL; namespace net { -class HttpRequestInfo; +struct HttpRequestInfo; extern gss_OID CHROME_GSS_C_NT_HOSTBASED_SERVICE_X; extern gss_OID CHROME_GSS_C_NT_HOSTBASED_SERVICE; @@ -205,7 +205,7 @@ class ScopedSecurityContext { explicit ScopedSecurityContext(GSSAPILibrary* gssapi_lib); ~ScopedSecurityContext(); - const gss_ctx_id_t get() const { return security_context_; } + gss_ctx_id_t get() const { return security_context_; } gss_ctx_id_t* receive() { return &security_context_; } private: |