diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-03 09:41:38 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-03 09:41:38 +1000 |
| commit | 98bb5c8cbdef20d060c45a399068580eacf93ae4 (patch) | |
| tree | b16faf2c64bb76945b75c4000c234457e5261a6e /src/corelib/tools/qcontiguouscache.h | |
| parent | aa9cf406d62004519ad54596e1c391f9a6439210 (diff) | |
| parent | 5aed3db0a4084f470769ad4b965001f17b878c79 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib/tools/qcontiguouscache.h')
| -rw-r--r-- | src/corelib/tools/qcontiguouscache.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/tools/qcontiguouscache.h b/src/corelib/tools/qcontiguouscache.h index 0020d2227..722192543 100644 --- a/src/corelib/tools/qcontiguouscache.h +++ b/src/corelib/tools/qcontiguouscache.h @@ -44,6 +44,7 @@ #include <QtCore/qatomic.h> #include <limits.h> +#include <new> QT_BEGIN_HEADER @@ -76,6 +77,12 @@ struct QContiguousCacheTypedData int start; int offset; uint sharable : 1; + // uint unused : 31; + + // total is 24 bytes (HP-UX aCC: 40 bytes) + // the next entry is already aligned to 8 bytes + // there will be an 8 byte gap here if T requires 16-byte alignment + // (such as long double on 64-bit platforms, __int128, __float128) T array[1]; }; |