diff options
Diffstat (limited to 'zenserver')
| -rw-r--r-- | zenserver/vfs.cpp | 2 | ||||
| -rw-r--r-- | zenserver/zenserver.cpp | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/zenserver/vfs.cpp b/zenserver/vfs.cpp index 86e265b20..b98801116 100644 --- a/zenserver/vfs.cpp +++ b/zenserver/vfs.cpp @@ -532,7 +532,7 @@ retry: } else if (hRes == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) { - throw zen::WindowsException(hRes, "Failed to initialize root placeholder"); + ThrowSystemException(hRes, "Failed to initialize root placeholder"); } // Ignore error, problems will be reported below anyway diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index ea4a2915e..529972cc0 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -24,15 +24,18 @@ #include <lua.hpp> #include <optional> #include <regex> +#include <set> #include <unordered_map> ////////////////////////////////////////////////////////////////////////// // We don't have any doctest code in this file but this is needed to bring // in some shared code into the executable -#define DOCTEST_CONFIG_IMPLEMENT -#include <doctest/doctest.h> -#undef DOCTEST_CONFIG_IMPLEMENT +#if ZEN_WITH_TESTS +# define DOCTEST_CONFIG_IMPLEMENT +# include <zencore/testing.h> +# undef DOCTEST_CONFIG_IMPLEMENT +#endif ////////////////////////////////////////////////////////////////////////// |