[med-svn] r10533 - in trunk/packages/plink/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2012-04-23 07:53:44 +0000 (Mon, 23 Apr 2012)
New Revision: 10533

Modified:
   trunk/packages/plink/trunk/debian/changelog
   trunk/packages/plink/trunk/debian/patches/gcc-4.7.patch
Log:
Previous patch to fix gcc-4.7 issues was incomplete; even more problems showed up


Modified: trunk/packages/plink/trunk/debian/changelog
===================================================================
--- trunk/packages/plink/trunk/debian/changelog	2012-04-23 07:02:57 UTC (rev 10532)
+++ trunk/packages/plink/trunk/debian/changelog	2012-04-23 07:53:44 UTC (rev 10533)
@@ -1,3 +1,10 @@
+plink (1.07-3) UNRELEASED; urgency=low
+
+  * debian/patches/gcc-4.7.patch: previous patch was incomplete
+    because the same problem occured in more files
+
+ -- Andreas Tille <tille at debian.org>  Mon, 23 Apr 2012 07:23:07 +0000
+
 plink (1.07-2) unstable; urgency=low
 
   * debian/control:

Modified: trunk/packages/plink/trunk/debian/patches/gcc-4.7.patch
===================================================================
--- trunk/packages/plink/trunk/debian/patches/gcc-4.7.patch	2012-04-23 07:02:57 UTC (rev 10532)
+++ trunk/packages/plink/trunk/debian/patches/gcc-4.7.patch	2012-04-23 07:53:44 UTC (rev 10533)
@@ -1,4 +1,5 @@
 Author: Rodolfo García Peñas <kix at kix.es>, Dmitry Nezhevenko <dion at inhex.net>, Fernando Lemos <fernandotcl at gmail.com
+Reviewed_by: Andreas Tille <tille at debian.org>
 Date: Sun, 22 Apr 2012 23:37:53 +0300
 Bug-Closed: http://bugs.debian.org/667325
 Description: Fix nested declaration which fails in gcc-4.7
@@ -6,8 +7,8 @@
    http://lists.debian.org/debian-mentors/2012/04/msg00410.html
  and the other mails in this thread
 
---- plink-1.07-src.orig/sets.cpp
-+++ plink-1.07-src/sets.cpp
+--- plink-1.07.orig/sets.cpp
++++ plink-1.07/sets.cpp
 @@ -768,11 +768,11 @@
        //////////////////////////////////////////////
        // Reset original missing status
@@ -24,3 +25,46 @@
  	}
  
        ////////////////////////////////////////////////
+--- plink-1.07.orig/elf.cpp
++++ plink-1.07/elf.cpp
+@@ -1175,10 +1175,10 @@
+ 	  << setw(8) << gcnt << " "
+ 	  << setw(8) << (double)cnt / (double)gcnt << "\n";
+ 
+-      map<int,int>::iterator i = chr_cnt.begin();
+-      while ( i != chr_cnt.end() )
++      map<int,int>::iterator i_iter = chr_cnt.begin();
++      while ( i_iter != chr_cnt.end() )
+ 	{
+-	  int c = i->first;
++	  int c = i_iter->first;
+ 	  int x = chr_cnt.find( c )->second;
+ 	  int y = chr_gcnt.find( c )->second;
+ 	  
+@@ -1189,7 +1189,7 @@
+ 	      << setw(8) << y << " "
+ 	      << setw(8) << (double)x / (double)y << "\n";
+ 	  
+-	  ++i;
++	  ++i_iter;
+ 	}
+       
+     }
+--- plink-1.07.orig/idhelp.cpp
++++ plink-1.07/idhelp.cpp
+@@ -772,12 +772,12 @@
+       for (int j = 0 ; j < jointField.size(); j++ )
+ 	{
+ 	  set<IDField*> & jf = jointField[j];
+-	  set<IDField*>::iterator j = jf.begin();
++	  set<IDField*>::iterator j_iter = jf.begin();
+ 	  PP->printLOG(" { ");
+-	  while ( j != jf.end() )
++	  while ( j_iter != jf.end() )
+ 	    {
+ 	      PP->printLOG( (*j)->name + " " );
+-	      ++j;
++	      ++j_iter;
+ 	    }
+ 	  PP->printLOG(" }");
+ 	}