diff options
author | Ben Wagner <bungeman@google.com> | 2017-08-28 10:34:05 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-28 17:48:57 +0000 |
commit | a93a14a99816d25b773f0b12868143702baf44bf (patch) | |
tree | 727e7cb88867bdc12cbcf8baa354ae3afc9444e2 /src/core/SkUtils.h | |
parent | 695db408437807d049ecc02b3b852704092728f2 (diff) |
Convert NULL and 0 to nullptr.
This was created by looking at warnings produced by clang's
-Wzero-as-null-pointer-constant. This updates most issues in
Skia code. However, there are places where GL and Vulkan want
pointer values which are explicitly 0, external headers which
use NULL directly, and possibly more uses in un-compiled
sources (for other platforms).
Change-Id: Id22fbac04d5c53497a53d734f0896b4f06fe8345
Reviewed-on: https://skia-review.googlesource.com/39521
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'src/core/SkUtils.h')
-rw-r--r-- | src/core/SkUtils.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/SkUtils.h b/src/core/SkUtils.h index 832bdbd8fd..d894467ce6 100644 --- a/src/core/SkUtils.h +++ b/src/core/SkUtils.h @@ -75,7 +75,7 @@ SkUnichar SkUTF8_PrevUnichar(const char**); into a utf8 sequence. Will be 1..kMaxBytesInUTF8Sequence, or 0 if uni is illegal. */ -size_t SkUTF8_FromUnichar(SkUnichar uni, char utf8[] = NULL); +size_t SkUTF8_FromUnichar(SkUnichar uni, char utf8[] = nullptr); /////////////////////////////////////////////////////////////////////////////// @@ -88,10 +88,10 @@ int SkUTF16_CountUnichars(const uint16_t utf16[], int numberOf16BitValues); SkUnichar SkUTF16_NextUnichar(const uint16_t**); // this guy backs up to the previus unichar value, and returns it (*--p) SkUnichar SkUTF16_PrevUnichar(const uint16_t**); -size_t SkUTF16_FromUnichar(SkUnichar uni, uint16_t utf16[] = NULL); +size_t SkUTF16_FromUnichar(SkUnichar uni, uint16_t utf16[] = nullptr); size_t SkUTF16_ToUTF8(const uint16_t utf16[], int numberOf16BitValues, - char utf8[] = NULL); + char utf8[] = nullptr); inline bool SkUnichar_IsVariationSelector(SkUnichar uni) { /* The 'true' ranges are: |