diff options
| author | Evan Martin <martine@danga.com> | 2013-04-13 19:37:16 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2013-04-13 19:37:16 (GMT) |
| commit | 96cc21d1ed14938852249718705ca536daa32817 (patch) | |
| tree | 9fcb8c735ce410b983188dd0b375ab4a64502541 | |
| parent | 368f5bc64ddd2dcea2662d6c932157314be3e09b (diff) | |
| parent | 84b629e474178da1462d04d0059be89a39832bd0 (diff) | |
| download | Ninja-96cc21d1ed14938852249718705ca536daa32817.zip Ninja-96cc21d1ed14938852249718705ca536daa32817.tar.gz Ninja-96cc21d1ed14938852249718705ca536daa32817.tar.bz2 | |
Merge pull request #541 from sgraham/fix-vs2012
try again on vs2012 build fixes
| -rwxr-xr-x | configure.py | 3 | ||||
| -rw-r--r-- | src/build_test.cc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.py b/configure.py index b40dafb..c526c1a 100755 --- a/configure.py +++ b/configure.py @@ -127,6 +127,7 @@ if platform == 'windows': # We never have strings or arrays larger than 2**31. '/wd4267', '/DNOMINMAX', '/D_CRT_SECURE_NO_WARNINGS', + '/D_VARIADIC_MAX=10', '/DNINJA_PYTHON="%s"' % options.with_python] ldflags = ['/DEBUG', '/libpath:$builddir'] if not options.debug: @@ -321,7 +322,7 @@ if options.with_gtest: gtest_all_incs = '-I%s -I%s' % (path, os.path.join(path, 'include')) if platform == 'windows': - gtest_cflags = '/nologo /EHsc /Zi ' + gtest_all_incs + gtest_cflags = '/nologo /EHsc /Zi /D_VARIADIC_MAX=10 ' + gtest_all_incs else: gtest_cflags = '-fvisibility=hidden ' + gtest_all_incs objs += n.build(built('gtest-all' + objext), 'cxx', diff --git a/src/build_test.cc b/src/build_test.cc index ea1c493..827998b 100644 --- a/src/build_test.cc +++ b/src/build_test.cc @@ -242,8 +242,8 @@ TEST_F(PlanTest, PoolsWithDepthTwo) { )); // Mark all the out* nodes dirty for (int i = 0; i < 3; ++i) { - GetNode("out" + string(1, '1' + i))->MarkDirty(); - GetNode("outb" + string(1, '1' + i))->MarkDirty(); + GetNode("out" + string(1, '1' + static_cast<char>(i)))->MarkDirty(); + GetNode("outb" + string(1, '1' + static_cast<char>(i)))->MarkDirty(); } GetNode("allTheThings")->MarkDirty(); |