From 3dbe8d9cde176fb3bd8ea1da8a5f2092fbda369e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 2 Aug 2012 13:22:35 +0200 Subject: don't take addresses of temporary arrays for gcc 4.7, this is an error Change-Id: Ia65da9f5547bab983e20e34f02bdc0c5f37e2270 Reviewed-by: Tapani Mikola --- tests/auto/client/test-jsondb-client.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/auto/client/test-jsondb-client.cpp b/tests/auto/client/test-jsondb-client.cpp index 03099c47..7374700c 100644 --- a/tests/auto/client/test-jsondb-client.cpp +++ b/tests/auto/client/test-jsondb-client.cpp @@ -330,16 +330,17 @@ void TestJsonDbClient::initTestCase() QByteArray app2NameBA = app2Name.toLocal8Bit(); if (!errno) { // Add primary groups + char *members[] = { NULL }; struct group grp; grp.gr_name = appNameBA.data(); grp.gr_passwd = NULL; grp.gr_gid = gid; - grp.gr_mem = (char *[]){NULL}; + grp.gr_mem = members; struct group grp2; grp2.gr_name = app2NameBA.data(); grp2.gr_passwd = NULL; grp2.gr_gid = gid2; - grp2.gr_mem = (char *[]){NULL}; + grp2.gr_mem = members; QByteArray etcigrBA = etcigr.toLocal8Bit(); FILE *grfile = ::fopen (etcigrBA.data(), "a"); ::putgrent(&grp, grfile); @@ -371,13 +372,14 @@ void TestJsonDbClient::initTestCase() ::putpwent(&pwd2, pwdfile); ::fclose (pwdfile); + char *members2[] = { appNameBA.data(), NULL }; // Add 'User' supplementary group gid = nextFreeGid(gid2+1); grp.gr_name = const_cast("User"); grp.gr_passwd = NULL; grp.gr_gid = gid; // Add only the first user to it - grp.gr_mem = (char *[]){appNameBA.data(), NULL}; + grp.gr_mem = members2; grfile = ::fopen (etcigrBA.data(), "a"); ::putgrent(&grp, grfile); ::fclose (grfile); -- cgit v1.2.3