diff options
author | Cary Clark <caryclark@skia.org> | 2017-09-14 12:12:32 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-14 17:32:31 +0000 |
commit | 7265ea32e5b543fa1cf0f12f469ac51f6a22f55b (patch) | |
tree | e60f19fe692bc3ccac7f458b1e6244bdb5d651a6 /tools | |
parent | 8ed7204968179600b2caa1885580bf4cb01b671b (diff) |
remove need for command flags cast
TBR=mtklein@google.com
Bug: skia: 6898
Change-Id: I1c83fe67cbfb978f15ebcbb9081ac4d4a8f00e4a
Reviewed-on: https://skia-review.googlesource.com/46680
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Cary Clark <caryclark@skia.org>
Commit-Queue: Cary Clark <caryclark@skia.org>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/bookmaker/bookmaker.cpp | 4 | ||||
-rw-r--r-- | tools/flags/SkCommandLineFlags.cpp | 2 | ||||
-rw-r--r-- | tools/flags/SkCommandLineFlags.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/bookmaker/bookmaker.cpp b/tools/bookmaker/bookmaker.cpp index 1df8d42e9c..ffe04810d5 100644 --- a/tools/bookmaker/bookmaker.cpp +++ b/tools/bookmaker/bookmaker.cpp @@ -2190,10 +2190,10 @@ int main(int argc, char** const argv) { SkCommandLineFlags::Parse(argc, argv); } else { SkCommandLineFlags::PrintUsage(); - const char* commands[] = { "", "-h", "bmh", "-h", "examples", "-h", "include", "-h", "fiddle", + const char* const commands[] = { "", "-h", "bmh", "-h", "examples", "-h", "include", "-h", "fiddle", "-h", "ref", "-h", "tokens", "-h", "crosscheck", "-h", "populate", "-h", "spellcheck" }; - SkCommandLineFlags::Parse(SK_ARRAY_COUNT(commands), (char**) commands); + SkCommandLineFlags::Parse(SK_ARRAY_COUNT(commands), commands); return 0; } if (FLAGS_bmh.isEmpty() && FLAGS_include.isEmpty()) { diff --git a/tools/flags/SkCommandLineFlags.cpp b/tools/flags/SkCommandLineFlags.cpp index b4bcf68906..8e38c525af 100644 --- a/tools/flags/SkCommandLineFlags.cpp +++ b/tools/flags/SkCommandLineFlags.cpp @@ -217,7 +217,7 @@ struct CompareFlagsByName { }; } // namespace -void SkCommandLineFlags::Parse(int argc, char** argv) { +void SkCommandLineFlags::Parse(int argc, const char* const * argv) { // Only allow calling this function once. static bool gOnce; if (gOnce) { diff --git a/tools/flags/SkCommandLineFlags.h b/tools/flags/SkCommandLineFlags.h index 78919c1ec6..15f12d915b 100644 --- a/tools/flags/SkCommandLineFlags.h +++ b/tools/flags/SkCommandLineFlags.h @@ -116,7 +116,7 @@ public: * Call at the beginning of main to parse flags created by DEFINE_x, above. * Must only be called once. */ - static void Parse(int argc, char** argv); + static void Parse(int argc, const char* const * argv); /** * Custom class for holding the arguments for a string flag. |