From 7d0cfd27ce197433e9fe6768e5f750d034415fce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Sun, 25 Feb 2018 21:29:01 +0100 Subject: [PATCH] Fix deprecation warning in ~ScopedMessage --- include/internal/catch_message.hpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/internal/catch_message.hpp b/include/internal/catch_message.hpp index 11d07466..3b9297a4 100644 --- a/include/internal/catch_message.hpp +++ b/include/internal/catch_message.hpp @@ -37,11 +37,18 @@ namespace Catch { : m_info( other.m_info ) {} +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4996) // std::uncaught_exception is deprecated in C++17 +#endif ScopedMessage::~ScopedMessage() { if ( !std::uncaught_exception() ){ getResultCapture().popScopedMessage(m_info); } } +#if defined(_MSC_VER) +#pragma warning(pop) +#endif } // end namespace Catch