[llvm-commits] [llvm] r140720 - /llvm/trunk/unittests/Support/TypeBuilderTest.cpp

[Eli Friedman]

Author: efriedma
Date: Wed Sep 28 15:41:50 2011
New Revision: 140720

URL: http://llvm.org/viewvc/llvm-project?rev=140720&view=rev
Log:
NULL cannot be portably used as the last argument to a function with __attribute((sentinel)), even though it usually works.  Use (void*)0 instead.  PR11002.


Modified:
    llvm/trunk/unittests/Support/TypeBuilderTest.cpp

Modified: llvm/trunk/unittests/Support/TypeBuilderTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/TypeBuilderTest.cpp?rev=140720&r1=140719&r2=140720&view=diff
==============================================================================
--- llvm/trunk/unittests/Support/TypeBuilderTest.cpp (original)
+++ llvm/trunk/unittests/Support/TypeBuilderTest.cpp Wed Sep 28 15:41:50 2011
@@ -235,19 +235,19 @@
                                      TypeBuilder<int, false>::get(getGlobalContext()),
                                      TypeBuilder<int*, false>::get(getGlobalContext()),
                                      TypeBuilder<void*[], false>::get(getGlobalContext()),
-                                     NULL)),
+                                     (void*)0)),
             (TypeBuilder<MyType*, false>::get(getGlobalContext())));
   EXPECT_EQ(PointerType::getUnqual(StructType::get(
                                      TypeBuilder<types::i<32>, false>::get(getGlobalContext()),
                                      TypeBuilder<types::i<32>*, false>::get(getGlobalContext()),
                                      TypeBuilder<types::i<8>*[], false>::get(getGlobalContext()),
-                                     NULL)),
+                                     (void*)0)),
             (TypeBuilder<MyPortableType*, false>::get(getGlobalContext())));
   EXPECT_EQ(PointerType::getUnqual(StructType::get(
                                      TypeBuilder<types::i<32>, false>::get(getGlobalContext()),
                                      TypeBuilder<types::i<32>*, false>::get(getGlobalContext()),
                                      TypeBuilder<types::i<8>*[], false>::get(getGlobalContext()),
-                                     NULL)),
+                                     (void*)0)),
             (TypeBuilder<MyPortableType*, true>::get(getGlobalContext())));
 }