diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-06-11 16:08:55 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-12 04:30:13 +0200 |
| commit | 69478da0f0d1eac9389fbd9d2f0bca3d0ce306a6 (patch) | |
| tree | cde317ef0b995a2791db1a62e8d410cdb0101de2 /src/corelib/tools/qarraydata.h | |
| parent | 1c86619037d837e2d9c6386d70b6b893f8456a96 (diff) | |
Don't use the gcc extension for QStringLiteral & Q_ARRAY_LITERAL
The extension doesn't work outside of function scopes, so a
function declaration such as
void foo(const QString &str = QStringLiteral("bar"));
would fail on certain gcc versions.
Change-Id: I2971301f2859edd3fc81b95dfa5a7c15f29e395c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/tools/qarraydata.h')
| -rw-r--r-- | src/corelib/tools/qarraydata.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/corelib/tools/qarraydata.h b/src/corelib/tools/qarraydata.h index e9f70bcf27..f3de8de46d 100644 --- a/src/corelib/tools/qarraydata.h +++ b/src/corelib/tools/qarraydata.h @@ -315,14 +315,6 @@ struct QArrayDataPointerRef return StaticWrapper::get(); \ }()) \ /**/ -#elif defined(Q_CC_GNU) -// Hide array within GCC's __extension__ {( )} block -#define Q_ARRAY_LITERAL(Type, ...) \ - __extension__ ({ \ - Q_ARRAY_LITERAL_IMPL(Type, __VA_ARGS__) \ - ref; \ - }) \ - /**/ #endif #endif // defined(Q_COMPILER_VARIADIC_MACROS) |