summaryrefslogtreecommitdiffstats
path: root/courgette
diff options
context:
space:
mode:
authorcraig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 16:27:18 +0000
committercraig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 16:27:18 +0000
commit8b8fab971151ba246c0930fa25c68b705f6a6c0b (patch)
tree0c6a51a8823d8fa36636e16ffa5e85a480c8716d /courgette
parent0d75bad6ecfdb9c7611f1001c5a1e9a0347b2337 (diff)
downloadchromium_src-8b8fab971151ba246c0930fa25c68b705f6a6c0b.zip
chromium_src-8b8fab971151ba246c0930fa25c68b705f6a6c0b.tar.gz
chromium_src-8b8fab971151ba246c0930fa25c68b705f6a6c0b.tar.bz2
Linux: fix a bunch of NULL vs. 0 issues spotted by gcc 4.5.
There are more gcc 4.5 issues to be solved so GYP_DEFINES=='werror=' is still required to build with 4.5 even with these changes. BUG=66652 TEST=compiles with gcc 4.5 and trybots Review URL: http://codereview.chromium.org/6186008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'courgette')
-rw-r--r--courgette/streams_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/courgette/streams_unittest.cc b/courgette/streams_unittest.cc
index 63393a3..e82c2d7 100644
--- a/courgette/streams_unittest.cc
+++ b/courgette/streams_unittest.cc
@@ -174,7 +174,7 @@ TEST(StreamsTest, StreamSetReadWrite) {
courgette::SourceStreamSet subset1;
bool can_read_1 = in.ReadSet(&subset1);
EXPECT_EQ(true, can_read_1);
- EXPECT_EQ(false, in.Empty());
+ EXPECT_FALSE(in.Empty());
courgette::SourceStreamSet subset2;
bool can_read_2 = in.ReadSet(&subset2);
@@ -183,10 +183,10 @@ TEST(StreamsTest, StreamSetReadWrite) {
courgette::SourceStreamSet subset3;
bool can_read_3 = in.ReadSet(&subset3);
- EXPECT_EQ(false, can_read_3);
+ EXPECT_FALSE(can_read_3);
- EXPECT_EQ(false, subset1.Empty());
- EXPECT_EQ(false, subset1.Empty());
+ EXPECT_FALSE(subset1.Empty());
+ EXPECT_FALSE(subset1.Empty());
uint32 datum;
EXPECT_EQ(true, subset1.stream(3)->ReadVarint32(&datum));