Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Unified Diff: base/thread_local_unittest.cc

Issue 226: Make gcc 4.1 happy with NULL in EXPECT_EQ (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 12 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/thread_local_unittest.cc
===================================================================
--- base/thread_local_unittest.cc (revision 1712)
+++ base/thread_local_unittest.cc (working copy)
@@ -85,13 +85,13 @@
done.Reset();
tp1.AddWork(&getter);
done.Wait();
- EXPECT_EQ(NULL, tls_val);
+ EXPECT_EQ(static_cast<ThreadLocalTesterBase*>(NULL), tls_val);
tls_val = kBogusPointer;
done.Reset();
tp2.AddWork(&getter);
done.Wait();
- EXPECT_EQ(NULL, tls_val);
+ EXPECT_EQ(static_cast<ThreadLocalTesterBase*>(NULL), tls_val);
SetThreadLocal setter(&tlp, &done);
@@ -113,7 +113,7 @@
done.Reset();
tp2.AddWork(&getter);
done.Wait();
- EXPECT_EQ(NULL, tls_val);
+ EXPECT_EQ(static_cast<ThreadLocalTesterBase*>(NULL), tls_val);
// Set thread 2 to kBogusPointer + 1.
setter.set_value(kBogusPointer + 1);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698