887048 - Use mozilla::MallocSizeOf instead of nsMallocSizeOfFun

Status: RESOLVED FIXED

(MailNews Core :: Database, defect)

Description

[Hiroyuki Ikezoe (:hiro)]

Bug 798914 introduced MallocSizeOf. We need to follow it to fix build errors:



                 from /home/zoe/hg/comm-central/mailnews/base/util/nsMsgDBFolder.cpp:18:
../../../mozilla/dist/include/nsMsgHdr.h:44:32: エラー: ‘nsMallocSizeOfFun’ has not been declared
../../../mozilla/dist/include/nsMsgHdr.h:48:32: エラー: ‘nsMallocSizeOfFun’ has not been declared
../../../mozilla/dist/include/nsMsgHdr.h: メンバ関数 ‘size_t nsMsgHdr::SizeOfExcludingThis(int) const’ 内:
../../../mozilla/dist/include/nsMsgHdr.h:46:63: エラー: ‘int’ から ‘size_t (*)(const void*) {aka long unsigned int (*)(const void*)}’ への無効な変換です [-fpermissive]
../../../mozilla/dist/include/nsTArray.h:833:10: エラー:   initializing argument 1 of ‘size_t nsTArray_Impl<E, Alloc>::SizeOfExcludingThis(mozilla::MallocSizeOf) const [with E = nsCString, Alloc = nsTArrayInfallibleAllocator, size_t = long unsigned int, mozilla::MallocSizeOf = long unsigned int (*)(const void*)]’ [-fpermissive]
../../../mozilla/dist/include/nsMsgHdr.h: メンバ関数 ‘size_t nsMsgHdr::SizeOfIncludingThis(int) const’ 内:
../../../mozilla/dist/include/nsMsgHdr.h:50:35: エラー: ‘aMallocSizeOfFun’ cannot be used as a function
In file included from ../../../mozilla/dist/include/nsMsgDatabase.h:18:0,

Sorry for the Japanese messages.

Comment 1

[Hiroyuki Ikezoe (:hiro)]

Attachment: Fix

Comment 2

[Mark Banner (:standard8)]

Comment on attachment 767490 [details] [diff] [review]
Fix

Review of attachment 767490 [details] [diff] [review]:
-----------------------------------------------------------------

Looks great, thanks for fixing the bustage. I'll land it now.

Comment 3

[Mark Banner (:standard8)]

https://hg.mozilla.org/comm-central/rev/63f411eb52f3