Fix catch_reference_nullptr.pass.cpp test for GCC.

This test contained an implicit conversion from nullptr to bool.
Clang warns about this but the test had supressed that warning.
However GCC diagnoses the same code as an error and requires
-fpermissive to accept it.

This patch fixes both the warning and the error by explicitly
converting the pointer to bool.

llvm-svn: 292638
This commit is contained in:
Eric Fiselier 2017-01-20 19:34:19 +00:00
parent cf9f422ba1
commit 35c8983c33

View File

@ -12,12 +12,6 @@
#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>
@ -25,7 +19,7 @@ static void catch_nullptr_test() {
try {
throw nullptr;
} catch (T &p) {
assert(CanCatchNullptr && !p);
assert(CanCatchNullptr && !static_cast<bool>(p));
} catch (...) {
assert(!CanCatchNullptr);
}