From 03d41ce5b9c557af01e44a21871c80ffd266d150 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Thu, 7 Sep 2017 11:25:10 +0100 Subject: [PATCH] Suppressed meaningless function type qualifier warning in MSVC again (this time in catch_tostring.h) --- include/internal/catch_tostring.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/internal/catch_tostring.h b/include/internal/catch_tostring.h index 5a82eba6..2caa96de 100644 --- a/include/internal/catch_tostring.h +++ b/include/internal/catch_tostring.h @@ -20,6 +20,10 @@ #include "catch_objc_arc.hpp" #endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4180) // qualifier applied to function type has no meaning +#endif // We need a dummy global operator<< so we can bring it into Catch namespace later struct Catch_global_namespace_dummy; @@ -320,7 +324,10 @@ namespace Catch { } // namespace Detail #endif // __OBJC__ - } // namespace Catch +#ifdef _MSC_VER +#pragma warning(pop) +#endif + #endif // TWOBLUECUBES_CATCH_TOSTRING_H_INCLUDED