diff options
| author | Luke Street <luke@street.dev> | 2026-02-28 21:19:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-28 20:19:17 -0800 |
| commit | 6a48380461bc9baabe1706ba57ca0cedfa2d0c51 (patch) | |
| tree | 593e054cfcb0250e63917c58b445a7e1f025a023 /src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp | |
| parent | b5d3b8c059c10711370437f7db7539cd90f1cb29 (diff) | |
More GCC compatibility/warning fixes (#3118)
* Wrap >4-char literals in a MULTI_CHAR macro
Modern compilers do not support CW's non-standard behavior with
>4 char literals. We can, however, use a constexpr function to
compute the u64 values directly. This leaves <=4 char literals
unchanged.
* Replace non-pointer usages of NULL with 0
* Define NULL to nullptr on C++11 and above
* Fix more -Wpointer-arith and -Woverflow warnings
* Replace u32/s32 with uintptr_t/intptr_t where appropriate
* JSUOutputStream: Overload all standard int types
Diffstat (limited to 'src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp')
| -rw-r--r-- | src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp b/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp index f973cb4779..596dfb2742 100644 --- a/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp +++ b/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp @@ -111,10 +111,10 @@ bool JAUDynamicSeqDataBlocks::appendDynamicSeqDataBlock(JAUSeqDataBlock* seqData return 1; } -static void JAUDynamicSeqDataBlocks_receiveLoaded_(u32 param_0, u32 param_1) { +static void JAUDynamicSeqDataBlocks_receiveLoaded_(u32 param_0, uintptr_t param_1) { JSULink<JAUSeqDataBlock>* link = (JSULink<JAUSeqDataBlock>*)param_1; JAUSeqDataBlock* seqDataBlock = link->getObject(); - if (param_0 != NULL) { + if (param_0 != 0) { seqDataBlock->field_0x1c = 2; } else { seqDataBlock->field_0x1c = 0; @@ -153,7 +153,7 @@ bool JAUDynamicSeqDataBlocks::loadDynamicSeq(JAISoundID param_0, bool param_1, JASResArcLoader::loadResourceAsync( seqDataArchive_, resourceId, link->getObject()->region.addr, link->getObject()->region.size, - JAUDynamicSeqDataBlocks_receiveLoaded_, (u32)link); + JAUDynamicSeqDataBlocks_receiveLoaded_, (uintptr_t)link); } return true; } |