Fix Wshadow warnings

As always, please add your wishes for alternative renaming of variable names.

Added 7 commits:

• 50ae534e...7fb6aa4d - 6 commits from branch master
• d6a68c60 - Fix Wshadow warnings

Rebased, and renamed as wished by Christian. I am not sure whether this is a good idea, as both nnz_ and j_ are only protected and not private.

Any objections?

(Again, while we're at it, hinting at an unrelated change): Is there a good reason here not to turn that into a switch statement?

Added 4 commits:

• d6a68c60...112fb39f - 3 commits from branch master
• e777a8d0 - Fix Wshadow warnings

Yet another try. I just reused the iterator solver to avoid adding complexity.

Yet another try. I just reused the iterator solver to avoid adding complexity.

I think reusing iterators is bad in general: it leaves it unclear if the previous value has any meaning. The code is easier to understand if variables have only a small scope and are not reused.

So I would either use different names for both iterators or make their scope smaller to avoid the shadowing.

Added 1 commit:

• 5b6619c8 - Fix Wshadow warnings

This time the name has been changed to solverIt.

LGTM ;)

Added 11 commits:

• 5b6619c8...65ee9b15 - 10 commits from branch master
• 3b2202f2 - Fix Wshadow warnings

mentioned in commit 6b890e74

Status changed to merged

@pipping FYI, One can make gitlab diffs ignore whitespace by adding ?w=1 to the URL: http://doc.gitlab.com/ce/workflow/merge_requests.html#ignore-whitespace-changes-in-merge-request-diff-view

mentioned in commit 922bd812