From 147a37ac6e240eba74d23b42626fb9323315595e Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Tue, 26 Nov 2019 23:18:19 -0600
Subject: [PATCH] [ox/std] Cleanup
---
deps/ox/src/ox/std/error.hpp | 3 ++-
deps/ox/src/ox/std/memops.cpp | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/deps/ox/src/ox/std/error.hpp b/deps/ox/src/ox/std/error.hpp
index 5e365bab..2baea002 100644
--- a/deps/ox/src/ox/std/error.hpp
+++ b/deps/ox/src/ox/std/error.hpp
@@ -19,7 +19,8 @@
#endif
#define oxIgnoreError(x)
-#define oxReturnError(x) if (const auto _err = ox::error::toError(x)) return _err
+#define oxReturnError(x) if (const auto _ox_error = ox::error::toError(x)) return _ox_error
+#define oxThrowError(x) if (const auto _ox_error = ox::error::toError(x)) throw _ox_error
namespace ox {
diff --git a/deps/ox/src/ox/std/memops.cpp b/deps/ox/src/ox/std/memops.cpp
index e24a3def..3c3472e2 100644
--- a/deps/ox/src/ox/std/memops.cpp
+++ b/deps/ox/src/ox/std/memops.cpp
@@ -11,7 +11,7 @@
#ifndef OX_USE_STDLIB
-#define ox_inhibit_loop_to_libcall __attribute__((__optimize__ ("-fno-tree-loop-distribute-patterns")))
+#define ox_inhibit_loop_to_libcall __attribute__((__optimize__("-fno-tree-loop-distribute-patterns")))
extern "C" {