diff options
author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 15:38:07 +0000 |
---|---|---|
committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-27 15:38:07 +0000 |
commit | f55bd486ab0ada0402fdcd34fb70a20d155fd968 (patch) | |
tree | 1eb9cf7c078d40c20320126d34f4cc4694082b1f /chrome_frame/function_stub_unittest.cc | |
parent | 4b0bd5f4c2d58c1620b49628be68f877928025fd (diff) | |
download | chromium_src-f55bd486ab0ada0402fdcd34fb70a20d155fd968.zip chromium_src-f55bd486ab0ada0402fdcd34fb70a20d155fd968.tar.gz chromium_src-f55bd486ab0ada0402fdcd34fb70a20d155fd968.tar.bz2 |
Enable warning 4389 as an error on windows builds. This will make
windows builds more similar to linux/mac, which already treat signed/
unsigned equality comparisons as warnings (and hence errors).
BUG=44471
TEST=none
Review URL: http://codereview.chromium.org/2222002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48395 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/function_stub_unittest.cc')
-rw-r--r-- | chrome_frame/function_stub_unittest.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome_frame/function_stub_unittest.cc b/chrome_frame/function_stub_unittest.cc index 4ad2c31..3f89bec 100644 --- a/chrome_frame/function_stub_unittest.cc +++ b/chrome_frame/function_stub_unittest.cc @@ -74,13 +74,15 @@ class FunctionStubTest: public testing::Test { static uintptr_t CALLBACK FooCallback0(FunctionStubTest* test) { return test->Foo0(); } - static uintptr_t CALLBACK FooCallback1(FunctionStubTest* test, uintptr_t arg) { + static uintptr_t CALLBACK FooCallback1(FunctionStubTest* test, + uintptr_t arg) { return test->Foo1(arg); } static uintptr_t CALLBACK BarCallback0(FunctionStubTest* test) { return test->Foo0(); } - static uintptr_t CALLBACK BarCallback1(FunctionStubTest* test, uintptr_t arg) { + static uintptr_t CALLBACK BarCallback1(FunctionStubTest* test, + uintptr_t arg) { return test->Foo1(arg); } @@ -119,10 +121,10 @@ TEST_F(FunctionStubTest, Accessors) { // Check that the stub code is executable. MEMORY_BASIC_INFORMATION info = {}; - EXPECT_NE(0, ::VirtualQuery(stub_->code(), &info, sizeof(info))); + EXPECT_NE(0u, ::VirtualQuery(stub_->code(), &info, sizeof(info))); const DWORD kExecutableMask = PAGE_EXECUTE | PAGE_EXECUTE_READ | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_WRITECOPY; - EXPECT_NE(0, info.Protect & kExecutableMask); + EXPECT_NE(0u, info.Protect & kExecutableMask); EXPECT_EQ(argument, stub_->argument()); EXPECT_TRUE(stub_->bypass_address() != NULL); |