diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-29 18:13:07 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-29 18:13:07 +0000 |
commit | 9b6fee14acedde5c6b627d5f9b691776fc8d868c (patch) | |
tree | 8cd3438dc3b6504066f89096e37db4cff4b903ed /base/weak_ptr_unittest.cc | |
parent | b1ed7b9beaf3069b54084c453da6db6bed56607c (diff) | |
download | chromium_src-9b6fee14acedde5c6b627d5f9b691776fc8d868c.zip chromium_src-9b6fee14acedde5c6b627d5f9b691776fc8d868c.tar.gz chromium_src-9b6fee14acedde5c6b627d5f9b691776fc8d868c.tar.bz2 |
Avoid potential "NULL used as int" warnings by changing ASSERT_EQ(NULL, ...) to ASSERT_TRUE(... == NULL). Patch by Jacob Mandelson (see http://codereview.chromium.org/202057 ), r=me.
BUG=none
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/weak_ptr_unittest.cc')
-rw-r--r-- | base/weak_ptr_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/base/weak_ptr_unittest.cc b/base/weak_ptr_unittest.cc index 4f53358..6d38caa 100644 --- a/base/weak_ptr_unittest.cc +++ b/base/weak_ptr_unittest.cc @@ -54,13 +54,13 @@ TEST(WeakPtrTest, Comparison) { TEST(WeakPtrTest, OutOfScope) { WeakPtr<int> ptr; - EXPECT_EQ(NULL, ptr.get()); + EXPECT_TRUE(ptr.get() == NULL); { int data; WeakPtrFactory<int> factory(&data); ptr = factory.GetWeakPtr(); } - EXPECT_EQ(NULL, ptr.get()); + EXPECT_TRUE(ptr.get() == NULL); } TEST(WeakPtrTest, Multiple) { @@ -73,8 +73,8 @@ TEST(WeakPtrTest, Multiple) { EXPECT_EQ(&data, a.get()); EXPECT_EQ(&data, b.get()); } - EXPECT_EQ(NULL, a.get()); - EXPECT_EQ(NULL, b.get()); + EXPECT_TRUE(a.get() == NULL); + EXPECT_TRUE(b.get() == NULL); } TEST(WeakPtrTest, UpCast) { @@ -98,7 +98,7 @@ TEST(WeakPtrTest, InvalidateWeakPtrs) { EXPECT_EQ(&data, ptr.get()); EXPECT_TRUE(factory.HasWeakPtrs()); factory.InvalidateWeakPtrs(); - EXPECT_EQ(NULL, ptr.get()); + EXPECT_TRUE(ptr.get() == NULL); EXPECT_FALSE(factory.HasWeakPtrs()); } |