Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1416767 - in /subversion/branches/1.7.x: ./ STATUS
 subversion/libsvn_auth_kwallet/kwallet.cpp
Date: Tue, 04 Dec 2012 04:02:26 -0000
To: commits@subversion.apache.org
From: svn-role@apache.org
Message-Id: <20121204040227.2B19E238890B@eris.apache.org>

Author: svn-role
Date: Tue Dec  4 04:02:25 2012
New Revision: 1416767

URL: http://svn.apache.org/viewvc?rev=1416767&view=rev
Log:
Merge r1345740 from trunk:

 * r1345740
   Remove a cast that is both ugly, and apparently illegal in g++ 4.7.
   Justification:
     Fails to build.
   Votes:
     +1: philip, rhuijben, stefan2

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/subversion/libsvn_auth_kwallet/kwallet.cpp

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1345740

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1416767&r1=1416766&r2=1416767&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue Dec  4 04:02:25 2012
@@ -135,11 +135,3 @@ Approved changes:
    Votes:
      +1: cmpilato, danielsh, rhuijben
 
- * r1345740
-   Remove a cast that is both ugly, and apparently illegal in g++ 4.7.
-   Justification:
-     Fails to build.
-   Votes:
-     +1: philip, rhuijben, stefan2
-
-

Modified: subversion/branches/1.7.x/subversion/libsvn_auth_kwallet/kwallet.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_auth_kwallet/kwallet.cpp?rev=1416767&r1=1416766&r2=1416767&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_auth_kwallet/kwallet.cpp (original)
+++ subversion/branches/1.7.x/subversion/libsvn_auth_kwallet/kwallet.cpp Tue Dec  4 04:02:25 2012
@@ -60,6 +60,9 @@
 /* KWallet simple provider, puts passwords in KWallet                    */
 /*-----------------------------------------------------------------------*/
 
+static int q_argc = 1;
+static char q_argv0[] = "svn"; // Build non-const char * from string constant
+static char *q_argv[] = { q_argv0 };
 
 static const char *
 get_application_name(apr_hash_t *parameters,
@@ -212,12 +215,11 @@ kwallet_password_get(svn_boolean_t *done
   QCoreApplication *app;
   if (! qApp)
     {
-      int argc = 1;
-      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
+      int argc = q_argc;
+      app = new QCoreApplication(argc, q_argv);
     }
 
-  KCmdLineArgs::init(1,
-                     (char *[1]) {(char *) "svn"},
+  KCmdLineArgs::init(q_argc, q_argv,
                      get_application_name(parameters, pool),
                      "subversion",
                      ki18n(get_application_name(parameters, pool)),
@@ -289,12 +291,11 @@ kwallet_password_set(svn_boolean_t *done
   QCoreApplication *app;
   if (! qApp)
     {
-      int argc = 1;
-      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
+      int argc = q_argc;
+      app = new QCoreApplication(argc, q_argv);
     }
 
-  KCmdLineArgs::init(1,
-                     (char *[1]) {(char *) "svn"},
+  KCmdLineArgs::init(q_argc, q_argv,
                      get_application_name(parameters, pool),
                      "subversion",
                      ki18n(get_application_name(parameters, pool)),