Merge branch 'main' into Log-Line-Cleaning

This commit is contained in:
cooltrain7
2022-01-03 17:51:13 +00:00
11 changed files with 50 additions and 27 deletions

View File

@@ -10,6 +10,10 @@
#include <map>
// CPPLinq
#ifdef _WIN32
#define NOMINMAX
// windows.h has min and max macros that breaks cpplinq
#endif
#include "cpplinq.hpp"
#pragma warning (disable : 4244) //Disable double to float conversion warnings