From 28a9c02857c3261d722b447f3540f751af4311fd Mon Sep 17 00:00:00 2001 From: Axel Menzel Date: Sat, 17 Feb 2018 18:46:13 +0100 Subject: [PATCH] fixed "warning STL4006: std::uncaught_exception() is deprecated in C++17" in catch --- 3rd_party/catch-1.12.0/catch/catch.hpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/3rd_party/catch-1.12.0/catch/catch.hpp b/3rd_party/catch-1.12.0/catch/catch.hpp index 6b5129d6..61bcf413 100644 --- a/3rd_party/catch-1.12.0/catch/catch.hpp +++ b/3rd_party/catch-1.12.0/catch/catch.hpp @@ -8501,11 +8501,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