summaryrefslogtreecommitdiffstats
path: root/src/sql
diff options
context:
space:
mode:
authorMarcel Krems <m.krems@software-vision.eu>2013-12-24 15:31:28 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-31 22:27:07 +0100
commit6c4c2b752c49e248d68a37873d45c60ff80323cd (patch)
tree34e9d5ab8bb4c58d55b1d1587af18289bc5f34e6 /src/sql
parentb276f4e5e867b55195c5d48cd8857f5f2acb240a (diff)
Move struct declaration out of the union to avoid a compiler warning.
Clang 3.3+ warns about this being an extension: qsqlerror.h:101: warning: anonymous types declared in an anonymous union are an extension [-Wnested-anon-types] Change-Id: I0350b977ff85558338b3b9db53d3fce7facb7635 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'src/sql')
-rw-r--r--src/sql/kernel/qsqlerror.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/sql/kernel/qsqlerror.h b/src/sql/kernel/qsqlerror.h
index 3f0164f302..4e27ab03ae 100644
--- a/src/sql/kernel/qsqlerror.h
+++ b/src/sql/kernel/qsqlerror.h
@@ -96,12 +96,13 @@ private:
// ### Qt6: Keep the pointer and remove the rest.
QString unused1;
QString unused2;
+ struct Unused {
+ ErrorType unused3;
+ int unused4;
+ };
union {
QSqlErrorPrivate *d;
- struct {
- ErrorType unused3;
- int unused4;
- } unused5;
+ Unused unused5;
};
};