Closed Bug 1189619 Opened 4 years ago Closed 4 years ago

Port bug Bug 1188745 [Rename nsTArray::SizeOfExcludingThis() as ShallowSizeOfExcludingThis() ] to comm-central

Categories

(MailNews Core :: Build Config, defect)

x86_64
Linux
defect
Not set

Tracking

(firefox42 fixed, seamonkey2.39 fixed)

RESOLVED FIXED
Thunderbird 42.0
Tracking Status
firefox42 --- fixed
seamonkey2.39 --- fixed

People

(Reporter: misak.bugzilla, Assigned: misak.bugzilla)

References

Details

Attachments

(1 file, 1 obsolete file)

We should make changes for comm-central part of bug 1188745 in order to able to build.
This patch allows to build on my Fedora 22 x64
Attachment #8641526 - Flags: review?(Pidgeot18)
Component: MailNews: Backend → Build Config
Product: SeaMonkey → MailNews Core
Comment on attachment 8641526 [details] [diff] [review]
Replace nsTArray SizeOfIncludingThis with ShallowSizeOfIncludingThis

Sorry, this looks wrong:

>+++ b/mailnews/db/msgdb/public/nsDBFolderInfo.h

>   virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const
>   {
>-    return m_lateredKeys.SizeOfExcludingThis(aMallocSizeOf);
>+    return m_lateredKeys.ShallowSizeOfIncludingThis(aMallocSizeOf);
Changing from Excluding to Including?!?

>+++ b/mailnews/db/msgdb/public/nsMsgHdr.h

>     size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOfFun) const
>     {
>-      return m_references.SizeOfExcludingThis(aMallocSizeOfFun);
>+      return m_references.ShallowSizeOfIncludingThis(aMallocSizeOfFun);
Changing from Excluding to Including?!?

>+++ b/mailnews/db/msgdb/src/nsMsgDatabase.cpp

>-  totalSize += m_newSet.SizeOfExcludingThis(aMallocSizeOf);
>-  totalSize += m_ChangeListeners.SizeOfExcludingThis(aMallocSizeOf);
>-  totalSize += m_threads.SizeOfExcludingThis(aMallocSizeOf);
>+  totalSize += m_newSet.ShallowSizeOfIncludingThis(aMallocSizeOf);
>+  totalSize += m_ChangeListeners.ShallowSizeOfExcludingThis(aMallocSizeOf);
>+  totalSize += m_threads.ShallowSizeOfIncludingThis(aMallocSizeOf);
Changing from Excluding to Including?!?
Attachment #8641526 - Flags: feedback-
Attached patch nsTArraySplinter Review
Sorry, my first patch after 2 years :(
Attachment #8641526 - Attachment is obsolete: true
Attachment #8641526 - Flags: review?(Pidgeot18)
Attachment #8641639 - Flags: review?(Pidgeot18)
Attachment #8641639 - Flags: feedback?(iann_bugzilla)
Attachment #8641639 - Flags: review?(Pidgeot18)
Attachment #8641639 - Flags: review+
Attachment #8641639 - Flags: feedback?(iann_bugzilla)
http://hg.mozilla.org/comm-central/rev/2a3f11bc96aa
Status: NEW → RESOLVED
Closed: 4 years ago
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird 42.0
You need to log in before you can comment on or make changes to this bug.