mirror of
https://github.com/zeldaret/tp
synced 2026-06-10 20:59:01 -04:00
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
This commit is contained in:
@@ -2270,7 +2270,7 @@ bool dMenu_Fmap_c::readFieldMapData(void** o_data, char const* i_path, bool para
|
||||
}
|
||||
|
||||
void dMenu_Fmap_c::decodeFieldMapData() {
|
||||
int field_data = (intptr_t)mpFieldDat;
|
||||
intptr_t field_data = (intptr_t)mpFieldDat;
|
||||
dMenu_Fmap_field_region_data_c* region_data
|
||||
= (dMenu_Fmap_field_region_data_c*)(field_data + mpFieldDat->mRegionDataOffset);
|
||||
dMenuMapCommon_c::Stage_c* stage_data
|
||||
|
||||
Reference in New Issue
Block a user