diff options
author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-04 07:57:10 +0000 |
---|---|---|
committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-04 07:57:10 +0000 |
commit | a34091e73ca417ac2d51f3894bca5696fa8b641a (patch) | |
tree | cbc82f10583000ad32df19dd2bdbc3aed13b4a8c /base/thread_local_unittest.cc | |
parent | 8a8d94e224f3c35190588991e503e267265e8e36 (diff) | |
download | chromium_src-a34091e73ca417ac2d51f3894bca5696fa8b641a.zip chromium_src-a34091e73ca417ac2d51f3894bca5696fa8b641a.tar.gz chromium_src-a34091e73ca417ac2d51f3894bca5696fa8b641a.tar.bz2 |
Make gcc 4.1 happy with NULL in EXPECT_EQ.
This avoids warnings like:
src/base/thread_local_unittest.cc:88: warning: passing NULL to non-pointer argument 3 of 'static testing::AssertionResult testing::internal::EqHelper<true>::Compare(const char*, const char*, const T1&, T2*) [with T1 = int, T2 = <unnamed>::ThreadLocalTesterBase]'
Review URL: http://codereview.chromium.org/226
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/thread_local_unittest.cc')
-rw-r--r-- | base/thread_local_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/thread_local_unittest.cc b/base/thread_local_unittest.cc index 9d6f875..7cced70 100644 --- a/base/thread_local_unittest.cc +++ b/base/thread_local_unittest.cc @@ -85,13 +85,13 @@ TEST(ThreadLocalTest, Pointer) { 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 @@ TEST(ThreadLocalTest, Pointer) { 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); |