| 1 |
jlec 12/07/04 09:31:27 |
| 2 |
|
| 3 |
Added: plink-1.07-gcc47.patch |
| 4 |
Log: |
| 5 |
sci-biology/plink: Moved to EAPI=4, add fix for building with gcc-4.7, #424709 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha115/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-biology/plink/files/plink-1.07-gcc47.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/plink/files/plink-1.07-gcc47.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/plink/files/plink-1.07-gcc47.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: plink-1.07-gcc47.patch |
| 16 |
=================================================================== |
| 17 |
elf.cpp | 6 +++--- |
| 18 |
idhelp.cpp | 8 ++++---- |
| 19 |
sets.cpp | 8 ++++---- |
| 20 |
3 files changed, 11 insertions(+), 11 deletions(-) |
| 21 |
|
| 22 |
diff --git a/elf.cpp b/elf.cpp |
| 23 |
index ec2ed3d..a57665f 100644 |
| 24 |
--- a/elf.cpp |
| 25 |
+++ b/elf.cpp |
| 26 |
@@ -1175,10 +1175,10 @@ void Plink::elfBaseline() |
| 27 |
<< setw(8) << gcnt << " " |
| 28 |
<< setw(8) << (double)cnt / (double)gcnt << "\n"; |
| 29 |
|
| 30 |
- map<int,int>::iterator i = chr_cnt.begin(); |
| 31 |
- while ( i != chr_cnt.end() ) |
| 32 |
+ map<int,int>::iterator j = chr_cnt.begin(); |
| 33 |
+ while ( j != chr_cnt.end() ) |
| 34 |
{ |
| 35 |
- int c = i->first; |
| 36 |
+ int c = j->first; |
| 37 |
int x = chr_cnt.find( c )->second; |
| 38 |
int y = chr_gcnt.find( c )->second; |
| 39 |
|
| 40 |
diff --git a/idhelp.cpp b/idhelp.cpp |
| 41 |
index a9244fa..8882097 100644 |
| 42 |
--- a/idhelp.cpp |
| 43 |
+++ b/idhelp.cpp |
| 44 |
@@ -772,12 +772,12 @@ void IDHelper::idHelp() |
| 45 |
for (int j = 0 ; j < jointField.size(); j++ ) |
| 46 |
{ |
| 47 |
set<IDField*> & jf = jointField[j]; |
| 48 |
- set<IDField*>::iterator j = jf.begin(); |
| 49 |
+ set<IDField*>::iterator k = jf.begin(); |
| 50 |
PP->printLOG(" { "); |
| 51 |
- while ( j != jf.end() ) |
| 52 |
+ while ( k != jf.end() ) |
| 53 |
{ |
| 54 |
- PP->printLOG( (*j)->name + " " ); |
| 55 |
- ++j; |
| 56 |
+ PP->printLOG( (*k)->name + " " ); |
| 57 |
+ ++k; |
| 58 |
} |
| 59 |
PP->printLOG(" }"); |
| 60 |
} |
| 61 |
diff --git a/sets.cpp b/sets.cpp |
| 62 |
index 3a8f92f..66787e8 100644 |
| 63 |
--- a/sets.cpp |
| 64 |
+++ b/sets.cpp |
| 65 |
@@ -768,11 +768,11 @@ vector_t Set::profileTestScore() |
| 66 |
////////////////////////////////////////////// |
| 67 |
// Reset original missing status |
| 68 |
|
| 69 |
- vector<Individual*>::iterator i = PP->sample.begin(); |
| 70 |
- while ( i != PP->sample.end() ) |
| 71 |
+ vector<Individual*>::iterator j = PP->sample.begin(); |
| 72 |
+ while ( j != PP->sample.end() ) |
| 73 |
{ |
| 74 |
- (*i)->missing = (*i)->flag; |
| 75 |
- ++i; |
| 76 |
+ (*j)->missing = (*j)->flag; |
| 77 |
+ ++j; |
| 78 |
} |
| 79 |
|
| 80 |
//////////////////////////////////////////////// |
Archives