From a1e5b2ad522e9f33e0ade445e6f5bdccdd7db68d Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Fri, 14 Jun 2019 18:13:50 -0500
Subject: [PATCH] [ox] Merge branch 'master' of github.com:gtalent/nostalgia

(synced from 1bf3809b47dacb098112b3bc7ccf70c0c83b1e39)
---
 src/ox/mc/test/tests.cpp | 2 ++
 src/ox/std/error.hpp     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ox/mc/test/tests.cpp b/src/ox/mc/test/tests.cpp
index a3dafabfc..1bea80fa3 100644
--- a/src/ox/mc/test/tests.cpp
+++ b/src/ox/mc/test/tests.cpp
@@ -6,6 +6,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#undef NDEBUG
+
 #include <assert.h>
 #include <iostream>
 #include <map>
diff --git a/src/ox/std/error.hpp b/src/ox/std/error.hpp
index ee2199008..2380c6e75 100644
--- a/src/ox/std/error.hpp
+++ b/src/ox/std/error.hpp
@@ -12,9 +12,9 @@
 #include "utility.hpp"
 
 #ifdef DEBUG
-#define OxError(x) ox::_error(__FILE__, __LINE__, x)
+#define OxError(x) ox::_error(__FILE__, __LINE__, static_cast<ox::Error>(x))
 #else
-#define OxError(x) x
+#define OxError(x) static_cast<ox::Error>(x)
 #endif
 
 #define oxReturnError(x) if (const auto _err = x) return _err