Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1667)

Issue 6865050: SkRRect.h: make kUnknown_Type part of the Type enum. (Closed)

Can't Edit
Can't Publish+Mail
Start Review
Created:
11 years, 9 months ago by hans
Modified:
11 years, 9 months ago
Reviewers:
robertphillips, TomH
CC:
skia-review_googlegroups.com
Base URL:
http://skia.googlecode.com/svn/trunk/
Visibility:
Public.

Description

SkRRect.h: make kUnknown_Type part of the Type enum. This fixes the following warnings from a recent Clang version (and also the build error in SkRRect.cpp): third_party/skia/include/core/SkRRect.h:86:27: error: comparison of constant -1 with expression of type 'SkRRect::Type' is always false [-Werror,-Wtautological-constant-out-of-range-compare] if (kUnknown_Type == fType) { ~~~~~~~~~~~~~ ^ ~~~~~ third_party/skia/include/core/SkRRect.h:89:32: error: comparison of constant -1 with expression of type 'SkRRect::Type' is always true [-Werror,-Wtautological-constant-out-of-range-compare] SkASSERT(kUnknown_Type != fType); ~~~~~~~~~~~~~ ^ ~~~~~ ../../third_party/skia/include/core/SkTypes.h:95:55: note: expanded from macro 'SkASSERT' #define SkASSERT(cond) SK_DEBUGBREAK(cond) ^ ../../skia/config/SkUserConfig.h:180:40: note: expanded from macro 'SK_DEBUGBREAK' #define SK_DEBUGBREAK(cond) do { if (!(cond)) { \ ^ BUG=crbug.com/163104

Patch Set 1 #

Patch Set 2 : New try #

Unified diffs Side-by-side diffs Delta from patch set Stats (+3 lines, -8 lines) Patch
M include/core/SkRRect.h View 1 2 chunks +3 lines, -5 lines 0 comments Download
M src/core/SkRRect.cpp View 1 chunk +0 lines, -3 lines 0 comments Download

Messages

Total messages: 4
hans
11 years, 9 months ago (2012-12-03 11:20:06 UTC) #1
hans
On 2012/12/03 11:20:06, hans wrote: gah, and it didn't upload all the files
11 years, 9 months ago (2012-12-03 11:20:22 UTC) #2
TomH
LGTM TBR=robertphillips (Changed to Rob's primary account.)
11 years, 9 months ago (2012-12-03 11:26:34 UTC) #3
TomH
11 years, 9 months ago (2012-12-03 11:42:27 UTC) #4
Committed as r6641.
It passed unit tests. I got some weird failures on GM which I can't believe were
related, but my GM setup is hinky, so I'm assuming it's tester error.
Please close this (+alternate approach in 6863051/) when you have a moment.
Sign in to reply to this message.

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b