From ec6326001d9aa7e681e69851b0c908c472a4e2f6 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Tue, 15 Jan 2019 17:39:33 -0600 Subject: [PATCH] [ox/std] Fix ox_malloca to work outside ox namespace --- deps/ox/src/ox/std/new.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/ox/src/ox/std/new.hpp b/deps/ox/src/ox/std/new.hpp index b5b8e627..0595b3e0 100644 --- a/deps/ox/src/ox/std/new.hpp +++ b/deps/ox/src/ox/std/new.hpp @@ -30,7 +30,7 @@ void *operator new(std::size_t, void*) noexcept; * @return an ox::MallocaPtr of the given type pointing to the requested size memory allocation */ #if defined(OX_USE_STDLIB) -#define ox_malloca(size, Type, ...) ox::MallocaPtr(size > MallocaStackLimit, new (size > MallocaStackLimit ? new uint8_t[size] : ox_alloca(size)) Type(__VA_ARGS__)) +#define ox_malloca(size, Type, ...) ox::MallocaPtr(size > ox::MallocaStackLimit, new (size > ox::MallocaStackLimit ? new uint8_t[size] : ox_alloca(size)) Type(__VA_ARGS__)) #else #define ox_malloca(size, Type, ...) ox::MallocaPtr(false, new (ox_alloca(size)) Type(__VA_ARGS__)) #endif