[haiku-commits] haiku: hrev47568 - headers/os/interface

  • From: jscipione@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 24 Jul 2014 19:57:03 +0200 (CEST)

hrev47568 adds 2 changesets to branch 'master'
old head: dc4ae0e9c00262d45c7995704d87ce12a168f862
new head: d11a323120b7aae53f178877ca4c4cc59ab6a1d1
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=d11a323+%5Edc4ae0e

----------------------------------------------------------------------------

fb224a9: Revert "TextView: Fix FBC size breakage"
  
  This reverts commit 8e268f7552ca94716995885483d34d4053cc94a2.

d11a323: TextView: Fix FBC size breakage, take 2
  
  Double checked BeOS R5 & Haiku R1/A4 and BTextView should be 356
  bytes, somewhere since then we've added 4 bytes. So, this commit
  reduces the class size from 360 back to 356 by removing 1 reserved
  int32 (instead of 2).
  
  I believe the class size changed in hrev46798 as a result of adding
  2 bools (1 byte each padded out to 4 bytes).
  
  Sorry for the noise.

                                     [ John Scipione <jscipione@xxxxxxxxx> ]

----------------------------------------------------------------------------

1 file changed, 1 insertion(+), 1 deletion(-)
headers/os/interface/TextView.h | 2 +-

############################################################################

Commit:      fb224a9f14d8c3c9d05609892f832d7937ad60a6
URL:         http://cgit.haiku-os.org/haiku/commit/?id=fb224a9
Author:      John Scipione <jscipione@xxxxxxxxx>
Date:        Thu Jul 24 17:15:30 2014 UTC

Revert "TextView: Fix FBC size breakage"

This reverts commit 8e268f7552ca94716995885483d34d4053cc94a2.

----------------------------------------------------------------------------

diff --git a/headers/os/interface/TextView.h b/headers/os/interface/TextView.h
index 9a5a1c1..907151e 100644
--- a/headers/os/interface/TextView.h
+++ b/headers/os/interface/TextView.h
@@ -460,7 +460,7 @@ private:
                        bool                            
fInstalledSelectOptionLinewiseShortcuts;
                        bool                            
fInstalledSelectHomeEndDocwiseShortcuts;
 
-                       uint32                          _reserved[4];
+                       uint32                          _reserved[6];
 };
 
 #endif // _TEXTVIEW_H

############################################################################

Revision:    hrev47568
Commit:      d11a323120b7aae53f178877ca4c4cc59ab6a1d1
URL:         http://cgit.haiku-os.org/haiku/commit/?id=d11a323
Author:      John Scipione <jscipione@xxxxxxxxx>
Date:        Thu Jul 24 17:55:09 2014 UTC

TextView: Fix FBC size breakage, take 2

Double checked BeOS R5 & Haiku R1/A4 and BTextView should be 356
bytes, somewhere since then we've added 4 bytes. So, this commit
reduces the class size from 360 back to 356 by removing 1 reserved
int32 (instead of 2).

I believe the class size changed in hrev46798 as a result of adding
2 bools (1 byte each padded out to 4 bytes).

Sorry for the noise.

----------------------------------------------------------------------------

diff --git a/headers/os/interface/TextView.h b/headers/os/interface/TextView.h
index 907151e..6fa15ca 100644
--- a/headers/os/interface/TextView.h
+++ b/headers/os/interface/TextView.h
@@ -460,7 +460,7 @@ private:
                        bool                            
fInstalledSelectOptionLinewiseShortcuts;
                        bool                            
fInstalledSelectHomeEndDocwiseShortcuts;
 
-                       uint32                          _reserved[6];
+                       uint32                          _reserved[5];
 };
 
 #endif // _TEXTVIEW_H


Other related posts:

  • » [haiku-commits] haiku: hrev47568 - headers/os/interface - jscipione