[libcxxabi] r276022 - Attempt to bring peace to -Werror buildbots.

[Richard Smith via cfe-commits]

Author: rsmith
Date: Tue Jul 19 15:35:09 2016
New Revision: 276022

URL: http://llvm.org/viewvc/llvm-project?rev=276022&view=rev
Log:
Attempt to bring peace to -Werror buildbots.

Modified:
    libcxxabi/trunk/test/catch_reference_nullptr.pass.cpp

Modified: libcxxabi/trunk/test/catch_reference_nullptr.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/test/catch_reference_nullptr.pass.cpp?rev=276022&r1=276021&r2=276022&view=diff
==============================================================================
--- libcxxabi/trunk/test/catch_reference_nullptr.pass.cpp (original)
+++ libcxxabi/trunk/test/catch_reference_nullptr.pass.cpp Tue Jul 19 15:35:09 2016
@@ -12,6 +12,12 @@
 #include <cassert>
 #include <cstdlib>
 
+// Clang emits a warning on converting an object of type nullptr_t to bool,
+// even in generic code. Suppress it.
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wnull-conversion"
+#endif
+
 struct A {};
 
 template<typename T, bool CanCatchNullptr>