diff options
| author | mmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 22:26:06 +0000 |
|---|---|---|
| committer | mmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 22:26:06 +0000 |
| commit | f1ea2fa47af56a08b964a5ad0512156bfcbfda11 (patch) | |
| tree | 1626a8a9dfb5de1b6ec86cb2552096d2ee2f1b75 /net/http/http_cache.cc | |
| parent | a2221350d2f9240099d88930d24c19b7745d3154 (diff) | |
| download | chromium_src-f1ea2fa47af56a08b964a5ad0512156bfcbfda11.zip chromium_src-f1ea2fa47af56a08b964a5ad0512156bfcbfda11.tar.gz chromium_src-f1ea2fa47af56a08b964a5ad0512156bfcbfda11.tar.bz2 | |
Fix the final gcc warnings in base and net. Provide some macros to selectively disable MSVC warnings.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1194 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_cache.cc')
| -rw-r--r-- | net/http/http_cache.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc index f629243..dad0d85 100644 --- a/net/http/http_cache.cc +++ b/net/http/http_cache.cc @@ -31,6 +31,7 @@ #include <algorithm> +#include "base/compiler_specific.h" #include "base/message_loop.h" #include "base/pickle.h" #include "base/ref_counted.h" @@ -45,8 +46,6 @@ #include "net/http/http_transaction.h" #include "net/http/http_util.h" -#pragma warning(disable: 4355) - namespace net { // disk cache entry data indices. @@ -196,9 +195,12 @@ class HttpCache::Transaction : public HttpTransaction, read_offset_(0), effective_load_flags_(0), final_upload_progress_(0), - network_info_callback_(this, &Transaction::OnNetworkInfoAvailable), - network_read_callback_(this, &Transaction::OnNetworkReadCompleted), - cache_read_callback_(this, &Transaction::OnCacheReadCompleted) { + ALLOW_THIS_IN_INITIALIZER_LIST( + network_info_callback_(this, &Transaction::OnNetworkInfoAvailable)), + ALLOW_THIS_IN_INITIALIZER_LIST( + network_read_callback_(this, &Transaction::OnNetworkReadCompleted)), + ALLOW_THIS_IN_INITIALIZER_LIST( + cache_read_callback_(this, &Transaction::OnCacheReadCompleted)) { AddRef(); // Balanced in Destroy } |