From 6c4c2b752c49e248d68a37873d45c60ff80323cd Mon Sep 17 00:00:00 2001
From: Marcel Krems <m.krems@software-vision.eu>
Date: Tue, 24 Dec 2013 15:31:28 +0100
Subject: 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>
---
 src/sql/kernel/qsqlerror.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src')

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;
     };
 };
 
-- 
cgit v1.2.3