drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[ox] Merge branch 'master' of github.com:gtalent/nostalgia

Browse Source
This commit is contained in:
Gary Talent 2019-06-14 18:13:50 -05:00
parent 0c05d298d0
commit 1bf3809b47
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/ox/src/ox/mc/test/tests.cpp vendored
View File

@ -6,6 +6,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#undef NDEBUG
#include <assert.h> #include <assert.h>
#include <iostream> #include <iostream>
#include <map> #include <map>

4
deps/ox/src/ox/std/error.hpp vendored
View File

@ -12,9 +12,9 @@
#include "utility.hpp" #include "utility.hpp"
#ifdef DEBUG #ifdef DEBUG
#define OxError(x) ox::_error(__FILE__, __LINE__, x) #define OxError(x) ox::_error(__FILE__, __LINE__, static_cast<ox::Error>(x))
#else #else
#define OxError(x) x #define OxError(x) static_cast<ox::Error>(x)
#endif #endif
#define oxReturnError(x) if (const auto _err = x) return _err #define oxReturnError(x) if (const auto _err = x) return _err