diff options
| author |  fmalita <fmalita@chromium.org> | 2015-06-10 10:46:50 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-10 10:46:50 -0700 |
| commit | 523beb7fd91e6a171a69f44cf6cc8e8d88a22dd0 (patch) | |
| tree | b6e074f221427f685d9cc45dac854817f8c5b645 /tools | |
| parent | d3c162200ffa02e4bb463c8bd2af2097cc04a0ef (diff) | |
Label some unused static vars as SK_UNUSED
Makes my gcc 5.1.1 much happier.
R=mtklein@google.com,scroggo@google.com
[ mtklein mischief below here ]
No public API changes.
TBR=reed@google.com
Review URL: https://codereview.chromium.org/1170863006
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/flags/SkCommandLineFlags.h | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/tools/flags/SkCommandLineFlags.h b/tools/flags/SkCommandLineFlags.h index 0fb023335e..465d4a01f9 100644 --- a/tools/flags/SkCommandLineFlags.h +++ b/tools/flags/SkCommandLineFlags.h @@ -180,59 +180,59 @@ private: #define DEFINE_bool(name, defaultValue, helpString) \ bool FLAGS_##name; \ -static bool unused_##name = SkFlagInfo::CreateBoolFlag(TO_STRING(name), \ - NULL, \ - &FLAGS_##name, \ - defaultValue, \ - helpString) +SK_UNUSED static bool unused_##name = SkFlagInfo::CreateBoolFlag(TO_STRING(name), \ + NULL, \ + &FLAGS_##name, \ + defaultValue, \ + helpString) // bool 2 allows specifying a short name. No check is done to ensure that shortName // is actually shorter than name. #define DEFINE_bool2(name, shortName, defaultValue, helpString) \ bool FLAGS_##name; \ -static bool unused_##name = SkFlagInfo::CreateBoolFlag(TO_STRING(name), \ - TO_STRING(shortName),\ - &FLAGS_##name, \ - defaultValue, \ - helpString) +SK_UNUSED static bool unused_##name = SkFlagInfo::CreateBoolFlag(TO_STRING(name), \ + TO_STRING(shortName),\ + &FLAGS_##name, \ + defaultValue, \ + helpString) #define DECLARE_bool(name) extern bool FLAGS_##name; #define DEFINE_string(name, defaultValue, helpString) \ SkCommandLineFlags::StringArray FLAGS_##name; \ -static bool unused_##name = SkFlagInfo::CreateStringFlag(TO_STRING(name), \ - NULL, \ - &FLAGS_##name, \ - defaultValue, \ - helpString) +SK_UNUSED static bool unused_##name = SkFlagInfo::CreateStringFlag(TO_STRING(name), \ + NULL, \ + &FLAGS_##name, \ + defaultValue, \ + helpString) // string2 allows specifying a short name. There is an assert that shortName // is only 1 character. #define DEFINE_string2(name, shortName, defaultValue, helpString) \ SkCommandLineFlags::StringArray FLAGS_##name; \ -static bool unused_##name = SkFlagInfo::CreateStringFlag(TO_STRING(name), \ - TO_STRING(shortName), \ - &FLAGS_##name, \ - defaultValue, \ - helpString) +SK_UNUSED static bool unused_##name = SkFlagInfo::CreateStringFlag(TO_STRING(name), \ + TO_STRING(shortName), \ + &FLAGS_##name, \ + defaultValue, \ + helpString) #define DECLARE_string(name) extern SkCommandLineFlags::StringArray FLAGS_##name; #define DEFINE_int32(name, defaultValue, helpString) \ int32_t FLAGS_##name; \ -static bool unused_##name = SkFlagInfo::CreateIntFlag(TO_STRING(name), \ - &FLAGS_##name, \ - defaultValue, \ - helpString) +SK_UNUSED static bool unused_##name = SkFlagInfo::CreateIntFlag(TO_STRING(name), \ + &FLAGS_##name, \ + defaultValue, \ + helpString) #define DECLARE_int32(name) extern int32_t FLAGS_##name; #define DEFINE_double(name, defaultValue, helpString) \ double FLAGS_##name; \ -static bool unused_##name = SkFlagInfo::CreateDoubleFlag(TO_STRING(name), \ - &FLAGS_##name, \ - defaultValue, \ - helpString) +SK_UNUSED static bool unused_##name = SkFlagInfo::CreateDoubleFlag(TO_STRING(name), \ + &FLAGS_##name, \ + defaultValue, \ + helpString) #define DECLARE_double(name) extern double FLAGS_##name; |