diff --git a/deps/GSL b/deps/GSL index 0822838a..a381a375 160000 --- a/deps/GSL +++ b/deps/GSL @@ -1 +1 @@ -Subproject commit 0822838a7c76d804bf6ede458d61113990693939 +Subproject commit a381a3759fbd66030065fc9949fa2cf4c2c1fd58 diff --git a/src/STDInclude.hpp b/src/STDInclude.hpp index ac8d6d5d..7b929f67 100644 --- a/src/STDInclude.hpp +++ b/src/STDInclude.hpp @@ -81,9 +81,6 @@ #pragma warning(disable: 6387) #pragma warning(disable: 26812) -#include -#include - // Enable additional literals using namespace std::literals; @@ -111,6 +108,9 @@ using namespace std::literals; #define AssertUnreachable assert(0 && "unreachable") +#include +#include + #pragma warning(pop) #include "Utils/Memory.hpp" // Breaks order on purpose