diff options
| author | Stephen Hines <srhines@google.com> | 2014-07-21 00:45:20 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-07-21 00:45:20 -0700 |
| commit | c6a4f5e819217e1e12c458aed8e7b122e23a3a58 (patch) | |
| tree | 81b7dd2bb4370a392f31d332a566c903b5744764 /unittests/ADT/PointerUnionTest.cpp | |
| parent | 19c6fbb3e8aaf74093afa08013134b61fa08f245 (diff) | |
| download | external_llvm-c6a4f5e819217e1e12c458aed8e7b122e23a3a58.tar.gz external_llvm-c6a4f5e819217e1e12c458aed8e7b122e23a3a58.tar.bz2 external_llvm-c6a4f5e819217e1e12c458aed8e7b122e23a3a58.zip | |
Update LLVM for rebase to r212749.
Includes a cherry-pick of:
r212948 - fixes a small issue with atomic calls
Change-Id: Ib97bd980b59f18142a69506400911a6009d9df18
Diffstat (limited to 'unittests/ADT/PointerUnionTest.cpp')
| -rw-r--r-- | unittests/ADT/PointerUnionTest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unittests/ADT/PointerUnionTest.cpp b/unittests/ADT/PointerUnionTest.cpp index 3bfb79cee4..a592784ae0 100644 --- a/unittests/ADT/PointerUnionTest.cpp +++ b/unittests/ADT/PointerUnionTest.cpp @@ -66,7 +66,7 @@ TEST_F(PointerUnionTest, Is) { TEST_F(PointerUnionTest, Get) { EXPECT_EQ(a.get<float *>(), &f); EXPECT_EQ(b.get<int *>(), &i); - EXPECT_EQ(n.get<int *>(), (int *)0); + EXPECT_EQ(n.get<int *>(), (int *)nullptr); } } // end anonymous namespace |