diff options
| author |  Mike Klein <mtklein@chromium.org> | 2016-09-26 13:02:35 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-09-26 17:43:10 +0000 |
| commit | 19eb8435cbce1200667024079750c6494b02079f (patch) | |
| tree | bb6f3dfbe25ac6de44d6db352704a5b1a1bf8dd5 | |
| parent | e1a5f4e292384046678edc5c1e360b3e13dc118c (diff) | |
-Wcomma may be good to go now.
This cleans up 3 remaining sites using , that probably meant ;
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2605
Change-Id: I5e48bcd85d72a205d2b0c860461dab1ec793dd18
Reviewed-on: https://skia-review.googlesource.com/2605
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
| -rw-r--r-- | gn/BUILD.gn | 1 | ||||
| -rw-r--r-- | src/gpu/GrMemoryPool.cpp | 2 | ||||
| -rw-r--r-- | tests/PathOpsSimplifyFailTest.cpp | 2 | ||||
| -rw-r--r-- | tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp | 6 |
4 files changed, 6 insertions, 5 deletions
diff --git a/gn/BUILD.gn b/gn/BUILD.gn index 9ffbf49718..55e6d2cd39 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn @@ -85,7 +85,6 @@ config("default") { # High priority to fix! cflags += [ - "-Wno-comma", "-Wno-conditional-uninitialized", "-Wno-covered-switch-default", "-Wno-deprecated", diff --git a/src/gpu/GrMemoryPool.cpp b/src/gpu/GrMemoryPool.cpp index ee54f6ba6e..6bc0f54602 100644 --- a/src/gpu/GrMemoryPool.cpp +++ b/src/gpu/GrMemoryPool.cpp @@ -18,7 +18,7 @@ GrMemoryPool::GrMemoryPool(size_t preallocSize, size_t minAllocSize) { SkDEBUGCODE(fAllocBlockCnt = 0); minAllocSize = SkTMax<size_t>(minAllocSize, 1 << 10); - fMinAllocSize = GrSizeAlignUp(minAllocSize + kPerAllocPad, kAlignment), + fMinAllocSize = GrSizeAlignUp(minAllocSize + kPerAllocPad, kAlignment); fPreallocSize = GrSizeAlignUp(preallocSize + kPerAllocPad, kAlignment); fPreallocSize = SkTMax(fPreallocSize, fMinAllocSize); fSize = 0; diff --git a/tests/PathOpsSimplifyFailTest.cpp b/tests/PathOpsSimplifyFailTest.cpp index 0166a841fa..359b12592b 100644 --- a/tests/PathOpsSimplifyFailTest.cpp +++ b/tests/PathOpsSimplifyFailTest.cpp @@ -161,7 +161,7 @@ path.quadTo(SkBits2Float(0xb6b6b6e9), SkBits2Float(0xb6b6b6b6), SkBits2Float(0xe #define TEST(test) test(reporter, #test) DEF_TEST(PathOpsSimplifyFail, reporter) { - TEST(fuzz763_1), + TEST(fuzz763_1); TEST(fuzz_x2); TEST(fuzz_x1); TEST(fuzz_59); diff --git a/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp b/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp index 1da245d87c..9cff0b7357 100644 --- a/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp +++ b/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp @@ -149,8 +149,10 @@ GLXGLTestContext::GLXGLTestContext(GrGLStandard forcedGpuAPI, GLXGLTestContext* // " SAMPLES = %d\n", // i, (unsigned int)vi->visualid, samp_buf, samples); - if (best_fbc < 0 || (samp_buf && samples > best_num_samp)) - best_fbc = i, best_num_samp = samples; + if (best_fbc < 0 || (samp_buf && samples > best_num_samp)) { + best_fbc = i; + best_num_samp = samples; + } } XFree(vi); } |