AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Guard colorNames variable under SK_SUPPORT_UNITTEST.

Browse Source 
That way clang does not complain with unneeded-internal-declaration warning,
because otherwise to clang this variable is unused and thus it won't
emit code for it.

The warning is:
../../src/utils/SkParseColor.cpp:35:3: error: variable 'colorNames' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration]
} colorNames[] = {

R=bsalomon@google.com, robertphillips@google.com

Author: tfarina@chromium.org

Review URL: https://codereview.chromium.org/27229004

git-svn-id: http://skia.googlecode.com/svn/trunk@11798 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2013-10-15 23:01:08 +00:00
parent 1a01bc492e
commit 607b3a93e0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/SkParseColor.cpp
View File

@ -12,6 +12,7 @@
#ifdef SK_DEBUG
#include "SkString.h"
#ifdef SK_SUPPORT_UNITTEST
// compress names 6 chars per long (packed 5 bits/char )
// note: little advantage to splitting chars across longs, since 3 longs at 2 unused bits each
// allow for one additional split char (vs. the 18 unsplit chars in the three longs)
@ -175,9 +176,8 @@ static const struct SkNameRGB {
{ "yellowgreen", 0x9ACD32 }
};
int colorNamesSize = sizeof(colorNames) / sizeof(colorNames[0]);
int colorNamesSize = SK_ARRAY_COUNT(colorNames);
#ifdef SK_SUPPORT_UNITTEST
static void CreateTable() {
SkString comment;
size_t originalSize = 0;