diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-07-19 20:35:09 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2016-07-19 20:35:09 +0000 |
| commit | 398d9c0c4a51a9e8501cee0b78bd850a2e420e52 (patch) | |
| tree | 9f23d7f257ee3e0bf2bcf51596404753fa52df13 /libcxxabi | |
| parent | d4c5e27a27ea0cba299e5241804c97267d39e032 (diff) | |
| download | bcm5719-llvm-398d9c0c4a51a9e8501cee0b78bd850a2e420e52.tar.gz bcm5719-llvm-398d9c0c4a51a9e8501cee0b78bd850a2e420e52.zip | |
Attempt to bring peace to -Werror buildbots.
llvm-svn: 276022
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/test/catch_reference_nullptr.pass.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libcxxabi/test/catch_reference_nullptr.pass.cpp b/libcxxabi/test/catch_reference_nullptr.pass.cpp index 0e7955fa266..3ab520f77b2 100644 --- a/libcxxabi/test/catch_reference_nullptr.pass.cpp +++ b/libcxxabi/test/catch_reference_nullptr.pass.cpp @@ -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> |
