diff options
| author |  caryclark <caryclark@google.com> | 2015-08-19 10:12:59 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-19 10:12:59 -0700 |
| commit | 95b96d649547c6b89ae0eca0f88f965d90c531a5 (patch) | |
| tree | 96f2dee74fd33751247cd25889affc861a79941d | |
| parent | c6ad06acefa096716f8dabed5342f9b89dc43dfe (diff) | |
Revert of cast SK_ARRAY_COUNT to make it sign agnostic (patchset #1 id:1 of https://codereview.chromium.org/1299943002/ )
Reason for revert:
fails on chrome build on windows
Original issue's description:
> cast SK_ARRAY_COUNT to make it sign agnostic
>
> By adding a cast to SK_ARRAY_COUNT, the compiler treats the
> compile-time value as if it were a const int, and like regular
> numbers, permits it to be compared to signed and unsigned
> numbers freely.
>
> R=reed@google.com
>
> Committed: https://skia.googlesource.com/skia/+/bca86202a48b2afa527b6e40d8b360ce3bc7c2e7
TBR=reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1285263007
| -rw-r--r-- | include/core/SkTypes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index fb1cceccc3..2e495117d8 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -305,7 +305,7 @@ static inline bool SkIsU16(long x) { /** Returns the number of entries in an array (not a pointer) */ template <typename T, size_t N> char (&SkArrayCountHelper(T (&array)[N]))[N]; -#define SK_ARRAY_COUNT(array) ((int) sizeof(SkArrayCountHelper(array))) +#define SK_ARRAY_COUNT(array) (sizeof(SkArrayCountHelper(array))) #define SkAlign2(x) (((x) + 1) >> 1 << 1) #define SkIsAlign2(x) (0 == ((x) & 1)) |