From 5dbe160633aa1bf1cd37cd6ae12641d172e50819 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 30 Mar 2019 17:11:41 -0500 Subject: [PATCH] [ox/std] Uglify OxError parameter name to prevent name conflicts --- deps/ox/src/ox/std/error.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/ox/src/ox/std/error.hpp b/deps/ox/src/ox/std/error.hpp index 2daaed51..fa8ec204 100644 --- a/deps/ox/src/ox/std/error.hpp +++ b/deps/ox/src/ox/std/error.hpp @@ -16,7 +16,7 @@ #define OxError(x) x #endif -#define oxReturnError(x) if (const auto err = x) return err +#define oxReturnError(x) if (const auto _err = x) return _err namespace ox {