From 596c0718e1b0fd9e19d007dc79491ceac2b16215 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Wed, 1 Dec 2021 01:34:53 -0600 Subject: [PATCH] [gbastartup] Fix incorrect bit_cast usages --- deps/gbastartup/cstartup.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/deps/gbastartup/cstartup.cpp b/deps/gbastartup/cstartup.cpp index 37dec185..b79f241b 100644 --- a/deps/gbastartup/cstartup.cpp +++ b/deps/gbastartup/cstartup.cpp @@ -6,16 +6,15 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include #include -#define MEM_EWRAM_BEGIN ox::bit_cast(0x02000000) -#define MEM_EWRAM_END ox::bit_cast(0x0203FFFF) +#define MEM_EWRAM_BEGIN reinterpret_cast(0x02000000) +#define MEM_EWRAM_END reinterpret_cast(0x0203FFFF) -#define HEAP_BEGIN ox::bit_cast(MEM_EWRAM_BEGIN) +#define HEAP_BEGIN reinterpret_cast(MEM_EWRAM_BEGIN) // set size to half of EWRAM #define HEAP_SIZE ((MEM_EWRAM_END - MEM_EWRAM_BEGIN) / 2) -#define HEAP_END ox::bit_cast(MEM_EWRAM_BEGIN + HEAP_SIZE) +#define HEAP_END reinterpret_cast(MEM_EWRAM_BEGIN + HEAP_SIZE) extern void (*__preinit_array_start[]) (void); extern void (*__preinit_array_end[]) (void);