diff options
| -rw-r--r-- | src/corelib/tools/qbytearray.h | 12 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.h | 20 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index dbac302d05..4190ffa18a 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -133,10 +133,10 @@ struct QByteArrayData inline const char *data() const { return d + sizeof(qptrdiff) + offset; } }; -template<int n> struct QConstByteArrayData +template<int N> struct QConstByteArrayData { const QByteArrayData ba; - const char data[n]; + const char data[N + 1]; }; template<int N> struct QConstByteArrayDataPtr @@ -147,9 +147,9 @@ template<int N> struct QConstByteArrayDataPtr #if defined(Q_COMPILER_LAMBDA) # define QByteArrayLiteral(str) ([]() { \ - enum { Size = sizeof(str) }; \ + enum { Size = sizeof(str) - 1 }; \ static const QConstByteArrayData<Size> qbytearray_literal = \ - { { Q_REFCOUNT_INITIALIZER(-1), Size -1, 0, 0, { 0 } }, str }; \ + { { Q_REFCOUNT_INITIALIZER(-1), Size, 0, 0, { 0 } }, str }; \ QConstByteArrayDataPtr<Size> holder = { &qbytearray_literal }; \ return holder; }()) @@ -160,9 +160,9 @@ template<int N> struct QConstByteArrayDataPtr # define QByteArrayLiteral(str) \ __extension__ ({ \ - enum { Size = sizeof(str) }; \ + enum { Size = sizeof(str) - 1 }; \ static const QConstByteArrayData<Size> qbytearray_literal = \ - { { Q_REFCOUNT_INITIALIZER(-1), Size -1, 0, 0, { 0 } }, str }; \ + { { Q_REFCOUNT_INITIALIZER(-1), Size, 0, 0, { 0 } }, str }; \ QConstByteArrayDataPtr<Size> holder = { &qbytearray_literal }; \ holder; }) #endif diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index af3e3f3ff9..4471da4b09 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -97,36 +97,36 @@ template<int N> struct QConstStringDataPtr }; #if defined(Q_COMPILER_UNICODE_STRINGS) -template<int n> struct QConstStringData +template<int N> struct QConstStringData { const QStringData str; - const char16_t data[n]; + const char16_t data[N + 1]; }; #define QT_QSTRING_UNICODE_MARKER u"" #elif defined(Q_OS_WIN) || (defined(__SIZEOF_WCHAR_T__) && __SIZEOF_WCHAR_T__ == 2) || defined(WCHAR_MAX) && (WCHAR_MAX - 0 < 65536) // wchar_t is 2 bytes -template<int n> struct QConstStringData +template<int N> struct QConstStringData { const QStringData str; - const wchar_t data[n]; + const wchar_t data[N + 1]; }; #define QT_QSTRING_UNICODE_MARKER L"" #else -template<int n> struct QConstStringData +template<int N> struct QConstStringData { const QStringData str; - const ushort data[n]; + const ushort data[N + 1]; }; #endif #if defined(QT_QSTRING_UNICODE_MARKER) # if defined(Q_COMPILER_LAMBDA) # define QStringLiteral(str) ([]() { \ - enum { Size = sizeof(QT_QSTRING_UNICODE_MARKER str)/2 }; \ + enum { Size = sizeof(QT_QSTRING_UNICODE_MARKER str)/2 - 1 }; \ static const QConstStringData<Size> qstring_literal = \ - { { Q_REFCOUNT_INITIALIZER(-1), Size -1, 0, 0, { 0 } }, QT_QSTRING_UNICODE_MARKER str }; \ + { { Q_REFCOUNT_INITIALIZER(-1), Size, 0, 0, { 0 } }, QT_QSTRING_UNICODE_MARKER str }; \ QConstStringDataPtr<Size> holder = { &qstring_literal }; \ return holder; }()) @@ -137,9 +137,9 @@ template<int n> struct QConstStringData # define QStringLiteral(str) \ __extension__ ({ \ - enum { Size = sizeof(QT_QSTRING_UNICODE_MARKER str)/2 }; \ + enum { Size = sizeof(QT_QSTRING_UNICODE_MARKER str)/2 - 1 }; \ static const QConstStringData<Size> qstring_literal = \ - { { Q_REFCOUNT_INITIALIZER(-1), Size -1, 0, 0, { 0 } }, QT_QSTRING_UNICODE_MARKER str }; \ + { { Q_REFCOUNT_INITIALIZER(-1), Size, 0, 0, { 0 } }, QT_QSTRING_UNICODE_MARKER str }; \ QConstStringDataPtr<Size> holder = { &qstring_literal }; \ holder; }) # endif |