Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/daBar_c.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ struct daBar_c : dActor_c {
virtual s32 Render();
virtual void OnPendingDestroy();

/* Leaf adapter until fBase_c::operator new(unsigned long) lands.
/* Leaf adapter until fBase_c::operator new(size_t) lands.
`return new daBar_c()` then routes through the retail allocator. */
static void *operator new(unsigned long size) {
static void *operator new(size_t size) {
return _ZN7fBase_cnwEj((unsigned)size);
}

Expand Down
4 changes: 2 additions & 2 deletions include/daObjTh_Fall_Block_c.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ struct daObjTh_Fall_Block_c : daObjFallBlock_c {
virtual s32 CleanupResources(); /* slot 3 */
virtual s32 InitResources(); /* slot 0 */

/* Leaf adapter until fBase_c::operator new(unsigned long) lands (#2570).
/* Leaf adapter until fBase_c::operator new(size_t) lands (#2570).
`return new daObjTh_Fall_Block_c()` then routes through the retail allocator. */
static void *operator new(unsigned long size) {
static void *operator new(size_t size) {
return _ZN7fBase_cnwEj((unsigned)size);
}
};
Expand Down
4 changes: 2 additions & 2 deletions include/daTBasket_c.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ struct daTBasket_c : dEnemyBase_c {
virtual s32 Behavior(); /* slot 6 -- ov063:0x0211b888 */
virtual s32 Render(); /* slot 9 -- ov063:0x0211b078 */

/* Leaf adapter until fBase_c::operator new(unsigned long) lands (#2570).
/* Leaf adapter until fBase_c::operator new(size_t) lands (#2570).
`return new daTBasket_c()` then routes through the retail allocator. */
static void *operator new(unsigned long size) {
static void *operator new(size_t size) {
return _ZN7fBase_cnwEj((unsigned)size);
}
};
Expand Down
2 changes: 1 addition & 1 deletion include/fBase_c.h
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ struct fBase_c {
(`j` / _ZN7fBase_cnwEj); CW rejects that signature in-class
("illegal 'operator' declaration"). `return new T` binds this size_t
overload and forwards. Not virtual, not layout. */
static void *operator new(unsigned long size) {
static void *operator new(size_t size) {
return _ZN7fBase_cnwEj((unsigned)size);
}
/* operator delete IS accepted in-class, and must be, INLINE: CW builds D0
Expand Down
Loading