diff options
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | base/timer_unittest.cc | 6 | ||||
| -rw-r--r-- | build/common.xcconfig | 4 | ||||
| -rw-r--r-- | net/base/net_util_unittest.cc | 6 | ||||
| -rw-r--r-- | net/url_request/url_request_http_job.cc | 9 |
5 files changed, 16 insertions, 13 deletions
@@ -3,7 +3,7 @@ deps = { "http://google-breakpad.googlecode.com/svn/trunk/src@281", "src/googleurl": - "http://google-url.googlecode.com/svn/trunk@91", + "http://google-url.googlecode.com/svn/trunk@92", "src/testing/gtest": "http://googletest.googlecode.com/svn/trunk@63", @@ -12,7 +12,7 @@ deps = { "svn://chrome-svn/chrome/trunk/third_party/WebKit@19", "src/third_party/icu38": - "svn://chrome-svn/chrome/trunk/deps/third_party/icu38@1010", + "svn://chrome-svn/chrome/trunk/deps/third_party/icu38@1197", "src/v8": "https://svn/r/googleclient/v8/trunk@130945", diff --git a/base/timer_unittest.cc b/base/timer_unittest.cc index 8b0f4b7..7086bd3 100644 --- a/base/timer_unittest.cc +++ b/base/timer_unittest.cc @@ -249,9 +249,9 @@ TEST(TimerTest, BrokenTimerCase) { TEST(TimerTest, DeleteFromRun) { // Make sure TimerManager correctly handles a Task that deletes itself when // run. - DeletingTask* deleting_task1 = new DeletingTask(50, true); + new DeletingTask(50, true); TimerTask timer_task(150, false); - DeletingTask* deleting_task2 = new DeletingTask(250, true); + new DeletingTask(250, true); TimerTask::RunTimers(); EXPECT_EQ(1, timer_task.iterations()); } @@ -326,7 +326,7 @@ TEST(TimerTest, FifoOrder) { MockTimerManager manager; const int kNumTimers = 1024; for (int i=0; i < kNumTimers; i++) - Timer* timer = manager.StartTimer(0, NULL, false); + manager.StartTimer(0, NULL, false); int last_id = -1; int new_id = 0; diff --git a/build/common.xcconfig b/build/common.xcconfig index f97ddb6..b30599a 100644 --- a/build/common.xcconfig +++ b/build/common.xcconfig @@ -35,6 +35,8 @@ GCC_ENABLE_PASCAL_STRINGS = NO GCC_INLINES_ARE_PRIVATE_EXTERN = YES GCC_PRECOMPILE_PREFIX_HEADER = YES GCC_SYMBOLS_PRIVATE_EXTERN = YES +GCC_TREAT_WARNINGS_AS_ERRORS = YES +GCC_WARN_ABOUT_MISSING_NEWLINE = YES OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(CODECOVERAGE_OTHER_LDFLAGS) PREBINDING = NO @@ -46,4 +48,4 @@ PREBINDING = NO SYMROOT = $(XCODEPROJ_DEPTH)/xcodebuild USE_HEADERMAP = NO -WARNING_CFLAGS = $(WARNING_CFLAGS) -Wall -Wendif-labels -Wnewline-eof +WARNING_CFLAGS = $(WARNING_CFLAGS) -Wall -Wendif-labels diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc index e29cb50..fcf99ba 100644 --- a/net/base/net_util_unittest.cc +++ b/net/base/net_util_unittest.cc @@ -570,8 +570,8 @@ TEST(NetUtilTest, IDNToUnicode) { #endif }; - for (int i = 0; i < ARRAYSIZE_UNSAFE(idn_cases); i++) { - for (int j = 0; j < arraysize(kLanguages); j++) { + for (size_t i = 0; i < ARRAYSIZE_UNSAFE(idn_cases); i++) { + for (size_t j = 0; j < arraysize(kLanguages); j++) { std::wstring output; net::IDNToUnicode(idn_cases[i].input, static_cast<int>(strlen(idn_cases[i].input)), @@ -682,7 +682,7 @@ TEST(NetUtilTest, GetSuggestedFilename) { L"", L"test.html"}, }; - for (int i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) { + for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) { std::wstring filename = net::GetSuggestedFilename( GURL(test_cases[i].url), test_cases[i].content_disp_header, test_cases[i].default_filename); 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()) { } |