summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
authormmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-22 04:03:44 +0000
committermmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-22 04:03:44 +0000
commit39ce5c010efa8c10cb1bbb33ad5c82e6b24f093c (patch)
tree546382483a18f0a676fdd9785ff4a1c51edf9ba1 /net/url_request
parent68475e609409624e43daf5adbfd127ee53bb6447 (diff)
downloadchromium_src-39ce5c010efa8c10cb1bbb33ad5c82e6b24f093c.zip
chromium_src-39ce5c010efa8c10cb1bbb33ad5c82e6b24f093c.tar.gz
chromium_src-39ce5c010efa8c10cb1bbb33ad5c82e6b24f093c.tar.bz2
Enable -Werror on the Mac. Fix two more warnings just added to our build. Note that the targets for libskia and libicuuc still exclude themselves from -Werror.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1205 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r--net/url_request/url_request_http_job.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index dbcfa05..d446a57 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -29,6 +29,7 @@
#include "net/url_request/url_request_http_job.h"
+#include "base/compiler_specific.h"
#include "base/message_loop.h"
#include "base/string_util.h"
#include "net/base/cookie_monster.h"
@@ -42,8 +43,6 @@
// TODO(darin): make sure the port blocking code is not lost
-#pragma warning(disable: 4355)
-
// static
URLRequestJob* URLRequestHttpJob::Factory(URLRequest* request,
const std::string& scheme) {
@@ -67,8 +66,10 @@ URLRequestHttpJob::URLRequestHttpJob(URLRequest* request)
response_info_(NULL),
proxy_auth_state_(net::AUTH_STATE_DONT_NEED_AUTH),
server_auth_state_(net::AUTH_STATE_DONT_NEED_AUTH),
- start_callback_(this, &URLRequestHttpJob::OnStartCompleted),
- read_callback_(this, &URLRequestHttpJob::OnReadCompleted),
+ ALLOW_THIS_IN_INITIALIZER_LIST(
+ start_callback_(this, &URLRequestHttpJob::OnStartCompleted)),
+ ALLOW_THIS_IN_INITIALIZER_LIST(
+ read_callback_(this, &URLRequestHttpJob::OnReadCompleted)),
read_in_progress_(false),
context_(request->context()) {
}