From 22c3a010690c97b8612d9ed379b10dacc059e083 Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Tue, 30 Jun 2020 22:18:24 +0100
Subject: [PATCH] Comment out additional includes of <cassert>

This overrode our own assert handler in stdafx.h
---
 src/3rdparty/mingw-std-threads/mingw.condition_variable.h | 2 +-
 src/3rdparty/mingw-std-threads/mingw.shared_mutex.h       | 2 +-
 src/3rdparty/optional/optional.hpp                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/3rdparty/mingw-std-threads/mingw.condition_variable.h b/src/3rdparty/mingw-std-threads/mingw.condition_variable.h
index 9862dc5058..4f7df18129 100644
--- a/src/3rdparty/mingw-std-threads/mingw.condition_variable.h
+++ b/src/3rdparty/mingw-std-threads/mingw.condition_variable.h
@@ -27,7 +27,7 @@
 //  Use the standard classes for std::, if available.
 #include <condition_variable>
 
-#include <cassert>
+//#include <cassert>
 #include <chrono>
 #include <system_error>
 #include <windows.h>
diff --git a/src/3rdparty/mingw-std-threads/mingw.shared_mutex.h b/src/3rdparty/mingw-std-threads/mingw.shared_mutex.h
index 72cc09a42e..4e26be82ec 100644
--- a/src/3rdparty/mingw-std-threads/mingw.shared_mutex.h
+++ b/src/3rdparty/mingw-std-threads/mingw.shared_mutex.h
@@ -31,7 +31,7 @@
 #error A C++11 compiler is required!
 #endif
 
-#include <cassert>
+//#include <cassert>
 //  For descriptive errors.
 #include <system_error>
 //    Implementing a shared_mutex without OS support will require atomic read-
diff --git a/src/3rdparty/optional/optional.hpp b/src/3rdparty/optional/optional.hpp
index fe1832b2ae..b77f21bc72 100644
--- a/src/3rdparty/optional/optional.hpp
+++ b/src/3rdparty/optional/optional.hpp
@@ -13,7 +13,7 @@
 # include <utility>
 # include <type_traits>
 # include <initializer_list>
-# include <cassert>
+//# include <cassert>
 # include <functional>
 # include <string>
 # include <stdexcept>