Merge pull request #1130 from JohnstonJ/fix-tests-on-vs2015
authorNico Weber <nicolasweber@gmx.de>
Tue, 19 Apr 2016 18:10:47 +0000 (14:10 -0400)
committerNico Weber <nicolasweber@gmx.de>
Tue, 19 Apr 2016 18:10:47 +0000 (14:10 -0400)
ninja_test: Fix Visual C++ 2015 warnings/errors about name hiding.


Trivial merge