Fixed an issue on some compilers with implicit conversion from nullptr to Ptr

- also cleaned up some warnings to do with CATCH_NULL
This commit is contained in:
Phil Nash 2015-07-03 18:27:36 +01:00
parent 62e517f833
commit d6f1446e4e
6 changed files with 13 additions and 5 deletions

View file

@ -16,8 +16,9 @@ CATCH_REGISTER_TAG_ALIAS( "[@tricky]", "[tricky]~[.]" )
#ifdef __clang__
#pragma clang diagnostic ignored "-Wpadded"
#pragma clang diagnostic ignored "-Wweak-vtables"
# pragma clang diagnostic ignored "-Wpadded"
# pragma clang diagnostic ignored "-Wweak-vtables"
# pragma clang diagnostic ignored "-Wc++98-compat"
#endif