1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
Author: Rodolfo García Peñas <kix@kix.es>, Dmitry Nezhevenko <dion@inhex.net>, Fernando Lemos <fernandotcl@gmail.com
Reviewed_by: Andreas Tille <tille@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
For more detailed explanation see
http://lists.debian.org/debian-mentors/2012/04/msg00410.html
and the other mails in this thread
--- plink-1.07.orig/sets.cpp
+++ plink-1.07/sets.cpp
@@ -768,11 +768,11 @@
//////////////////////////////////////////////
// Reset original missing status
- vector<Individual*>::iterator i = PP->sample.begin();
- while ( i != PP->sample.end() )
+ vector<Individual*>::iterator i_iter = PP->sample.begin();
+ while ( i_iter != PP->sample.end() )
{
- (*i)->missing = (*i)->flag;
- ++i;
+ (*i_iter)->missing = (*i_iter)->flag;
+ ++i_iter;
}
////////////////////////////////////////////////
--- 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;
+ PP->printLOG( (*j_iter)->name + " " );
+ ++j_iter;
}
PP->printLOG(" }");
}
|
