Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorPhil Nash2017-09-07 11:25:10 +0100
committerPhil Nash2017-09-07 11:25:10 +0100
commit03d41ce5b9c557af01e44a21871c80ffd266d150 (patch)
tree80291fefff4e945ab75965fbf48a2933eadc05df /include
parentc5608f0202eb8ffd360e58db081fef248d675a6b (diff)
downloadcatch3-03d41ce5b9c557af01e44a21871c80ffd266d150.tar.gz
Suppressed meaningless function type qualifier warning in MSVC again
(this time in catch_tostring.h)
Diffstat (limited to 'include')
-rw-r--r--include/internal/catch_tostring.h9
1 files changed, 8 insertions, 1 deletions
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