GCC rightfully complains about redefined variables, as iterator declarations appear inside loops with a loop variable of the same name. This patch has been sent upstream. --- a/sets.cpp 2015-06-25 11:22:08.252821681 +0200 +++ b/sets.cpp 2015-06-25 11:22:23.239187985 +0200 @@ -768,11 +768,11 @@ ////////////////////////////////////////////// // Reset original missing status - vector::iterator i = PP->sample.begin(); - while ( i != PP->sample.end() ) + vector::iterator it = PP->sample.begin(); + while ( it != PP->sample.end() ) { - (*i)->missing = (*i)->flag; - ++i; + (*it)->missing = (*it)->flag; + ++it; } //////////////////////////////////////////////// --- a/elf.cpp 2009-10-10 18:00:21.000000000 +0200 +++ b/elf.cpp 2015-06-25 11:34:06.136835756 +0200 @@ -1175,10 +1175,10 @@ << setw(8) << gcnt << " " << setw(8) << (double)cnt / (double)gcnt << "\n"; - map::iterator i = chr_cnt.begin(); - while ( i != chr_cnt.end() ) + map::iterator it = chr_cnt.begin(); + while ( it != chr_cnt.end() ) { - int c = i->first; + int c = it->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; + ++it; } } --- plink-1.07-src/idhelp.cpp 2009-10-10 18:00:22.000000000 +0200 +++ plink-1.07-src/idhelp.cpp.patched 2015-06-25 11:37:39.387204086 +0200 @@ -772,12 +772,12 @@ for (int j = 0 ; j < jointField.size(); j++ ) { set & jf = jointField[j]; - set::iterator j = jf.begin(); + set::iterator jit = jf.begin(); PP->printLOG(" { "); - while ( j != jf.end() ) + while ( jit != jf.end() ) { - PP->printLOG( (*j)->name + " " ); - ++j; + PP->printLOG( (*jit)->name + " " ); + ++jit; } PP->printLOG(" }"); } id=0f6aaf2f62fe3f29bec9751178ea2a7c39706f80'>root/tests/print.scm
AgeCommit message (Expand)Author
2021-11-17Merge branch 'master' into core-updates-frozenLudovic Courtès
2021-11-11import: print: Replace packages and origins in 'arguments'....* guix/import/print.scm (package->code)[variable-reference] [object->code]: New procedures. [package-lists->code]: Rewrite in terms of 'object->code'. Pass the 'arguments' field through 'object->code'. * tests/print.scm (pkg-with-arguments, pkg-with-arguments-source): New variables. ("package with arguments"): New test. Ludovic Courtès
2021-11-11import: print: Handle patches that are origins....* guix/import/print.scm (package->code)[source->code]: Handle patches that are origins. * tests/print.scm (pkg-with-origin-input): Add 'patches' field. (pkg-with-origin-patch, pkg-with-origin-patch-source): New variables. ("package with origin patch"): New test. Ludovic Courtès
2021-11-11import: print: Correctly handle URI lists....* guix/import/print.scm (package->code)[factorized-uri-code]: New procedure. [source->code]: Use it, and factorize URI when it's a list. * tests/print.scm (pkg-with-origin-input): Check origin URI to a list. Ludovic Courtès
2021-11-11import: print: Properly render packages with origins as inputs....* guix/import/print.scm (package->code)[source->code]: Check whether VERSION is true before calling 'factorize-uri'. [package-lists->code]: Add clause for inputs that are origins. * tests/print.scm (pkg-with-origin-input, pkg-with-origin-input-source): New variables. ("package with origin input"): New test. Ludovic Courtès
2021-07-11import: print: Emit new-style package inputs when possible....* guix/import/print.scm (redundant-input-labels?): New procedure. (package->code)[package-lists->code]: Rename to... [inputs->code]: ... this. When 'redundant-input-labels?' returns true, emit label-less inputs. Adjust callers to new name. * tests/print.scm (pkg-with-inputs): Adjust accordingly. Ludovic Courtès
2020-04-20tests: Update expected values for package->code....Reported by janneke on IRC. * tests/print.scm: Update expected package definitions produced by package->code. Ricardo Wurmus