chromium/src
0
Fork 0
Code Activity

Make gcc 4.1 happy with NULL in EXPECT_EQ.

Browse Source 
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
This commit is contained in:
mmoss@google.com
2008-09-04 07:57:10 +00:00
parent 8a8d94e224
commit a34091e73c
1 changed files with 3 additions and 3 deletions

6
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);