/[debian-med]/trunk/packages/plink/trunk/debian/patches/gcc-4.7.patch
ViewVC logotype

Diff of /trunk/packages/plink/trunk/debian/patches/gcc-4.7.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 10532 by tille, Mon Apr 23 06:54:21 2012 UTC revision 10533 by tille, Mon Apr 23 07:53:44 2012 UTC
# Line 1  Line 1 
1  Author: Rodolfo García Peñas <kix@kix.es>, Dmitry Nezhevenko <dion@inhex.net>, Fernando Lemos <fernandotcl@gmail.com  Author: Rodolfo García Peñas <kix@kix.es>, Dmitry Nezhevenko <dion@inhex.net>, Fernando Lemos <fernandotcl@gmail.com
2    Reviewed_by: Andreas Tille <tille@debian.org>
3  Date: Sun, 22 Apr 2012 23:37:53 +0300  Date: Sun, 22 Apr 2012 23:37:53 +0300
4  Bug-Closed: http://bugs.debian.org/667325  Bug-Closed: http://bugs.debian.org/667325
5  Description: Fix nested declaration which fails in gcc-4.7  Description: Fix nested declaration which fails in gcc-4.7
# Line 6  Description: Fix nested declaration whic Line 7  Description: Fix nested declaration whic
7     http://lists.debian.org/debian-mentors/2012/04/msg00410.html     http://lists.debian.org/debian-mentors/2012/04/msg00410.html
8   and the other mails in this thread   and the other mails in this thread
9    
10  --- plink-1.07-src.orig/sets.cpp  --- plink-1.07.orig/sets.cpp
11  +++ plink-1.07-src/sets.cpp  +++ plink-1.07/sets.cpp
12  @@ -768,11 +768,11 @@  @@ -768,11 +768,11 @@
13         //////////////////////////////////////////////         //////////////////////////////////////////////
14         // Reset original missing status         // Reset original missing status
# Line 24  Description: Fix nested declaration whic Line 25  Description: Fix nested declaration whic
25          }          }
26    
27         ////////////////////////////////////////////////         ////////////////////////////////////////////////
28    --- plink-1.07.orig/elf.cpp
29    +++ plink-1.07/elf.cpp
30    @@ -1175,10 +1175,10 @@
31              << setw(8) << gcnt << " "
32              << setw(8) << (double)cnt / (double)gcnt << "\n";
33    
34    -      map<int,int>::iterator i = chr_cnt.begin();
35    -      while ( i != chr_cnt.end() )
36    +      map<int,int>::iterator i_iter = chr_cnt.begin();
37    +      while ( i_iter != chr_cnt.end() )
38            {
39    -         int c = i->first;
40    +         int c = i_iter->first;
41              int x = chr_cnt.find( c )->second;
42              int y = chr_gcnt.find( c )->second;
43    
44    @@ -1189,7 +1189,7 @@
45                  << setw(8) << y << " "
46                  << setw(8) << (double)x / (double)y << "\n";
47    
48    -         ++i;
49    +         ++i_iter;
50            }
51    
52         }
53    --- plink-1.07.orig/idhelp.cpp
54    +++ plink-1.07/idhelp.cpp
55    @@ -772,12 +772,12 @@
56           for (int j = 0 ; j < jointField.size(); j++ )
57            {
58              set<IDField*> & jf = jointField[j];
59    -         set<IDField*>::iterator j = jf.begin();
60    +         set<IDField*>::iterator j_iter = jf.begin();
61              PP->printLOG(" { ");
62    -         while ( j != jf.end() )
63    +         while ( j_iter != jf.end() )
64                {
65                  PP->printLOG( (*j)->name + " " );
66    -             ++j;
67    +             ++j_iter;
68                }
69              PP->printLOG(" }");
70            }
Legend:
Removed from v.10532  
changed lines
  Added in v.10533
  ViewVC Help
Powered by ViewVC 1.1.5