diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-03-12 17:14:48 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-23 19:43:00 +0100 |
| commit | accfdc85e5cb1816b3eda02ec8d37474259c247e (patch) | |
| tree | e2c0369b07eaac3982f155adc8890532e6799e0a /src/corelib/kernel/qmetaobjectbuilder.cpp | |
| parent | 98c3b8a44220096a4e2a3967a4e9742c3605a5cd (diff) | |
Fallback implementation of Q_ALIGNOF
For all practical purposes, the fallback introduced here returns the
desired value. Having a fallback enables unconditional use of Q_ALIGNOF.
For compilers that provide native support for it, Q_ALIGNOF is otherwise
#defined in qcompilerdetection.h.
Change-Id: Ie148ca8936cbbf8b80fe87771a14797c39a9d30c
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qmetaobjectbuilder.cpp')
| -rw-r--r-- | src/corelib/kernel/qmetaobjectbuilder.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp index 59740960c9..8d6d7cbe91 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/corelib/kernel/qmetaobjectbuilder.cpp @@ -1095,11 +1095,7 @@ int QMetaStringTable::enter(const QByteArray &value) int QMetaStringTable::preferredAlignment() { -#ifdef Q_ALIGNOF return Q_ALIGNOF(QByteArrayData); -#else - return sizeof(void *); -#endif } // Returns the size (in bytes) required for serializing this string table. |