dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Comment out additional includes of <cassert>

Browse Source 
This overrode our own assert handler in stdafx.h
This commit is contained in:
Jonathan G Rennison
2020-06-30 22:18:24 +01:00
parent 3adeff1883
commit 22c3a01069
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/mingw-std-threads/mingw.condition_variable.h vendored
View File

@@ -27,7 +27,7 @@
// Use the standard classes for std::, if available. // Use the standard classes for std::, if available.
#include <condition_variable> #include <condition_variable>
#include <cassert> //#include <cassert>
#include <chrono> #include <chrono>
#include <system_error> #include <system_error>
#include <windows.h> #include <windows.h>

2
src/3rdparty/mingw-std-threads/mingw.shared_mutex.h vendored
View File

@@ -31,7 +31,7 @@
#error A C++11 compiler is required! #error A C++11 compiler is required!
#endif #endif
#include <cassert> //#include <cassert>
// For descriptive errors. // For descriptive errors.
#include <system_error> #include <system_error>
// Implementing a shared_mutex without OS support will require atomic read- // Implementing a shared_mutex without OS support will require atomic read-

2
src/3rdparty/optional/optional.hpp vendored
View File

@@ -13,7 +13,7 @@
# include <utility> # include <utility>
# include <type_traits> # include <type_traits>
# include <initializer_list> # include <initializer_list>
# include <cassert> //# include <cassert>
# include <functional> # include <functional>
# include <string> # include <string>
# include <stdexcept> # include <stdexcept>