From c4d1aa90337300a8c7646b3f28b0a6783eec5a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?=
 <martin.horenovsky@gmail.com>
Date: Thu, 7 Dec 2017 19:10:28 +0100
Subject: [PATCH] Fix std::uncaught_exception deprecation warning in
 ~ScopedMessage

Closes #1124
---
 include/internal/catch_message.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/include/internal/catch_message.cpp b/include/internal/catch_message.cpp
index a66c5271..513c1776 100644
--- a/include/internal/catch_message.cpp
+++ b/include/internal/catch_message.cpp
@@ -49,11 +49,18 @@ namespace Catch {
         getResultCapture().pushScopedMessage( 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