aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkString.cpp
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2018-06-13 15:01:39 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-14 14:10:47 +0000
commite1bc7de7c07686b28b00b850e44e0722189f3592 (patch)
tree827ddab1abd7f6df76287bdab1ed65ccf6801e36 /src/core/SkString.cpp
parentb6b5b7a8082eddc6b198817ab0ea7d9c9f5dd4e4 (diff)
Remove SK_MaxSizeT, SK_M{in|ax}U{16|32}, #defines.
sed 's/SK_MaxSizeT/SIZE_MAX/g' sed 's/SK_MaxU32/UINT32_MAX/g' sed 's/SK_MaxU16/UINT16_MAX/g' SK_MinU32 and SK_MinU16 were unused Change-Id: I6b6c824df47b05bde7e73b13a58e851a5f63fe0e Reviewed-on: https://skia-review.googlesource.com/134607 Commit-Queue: Hal Canary <halcanary@google.com> Reviewed-by: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'src/core/SkString.cpp')
-rw-r--r--src/core/SkString.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/SkString.cpp b/src/core/SkString.cpp
index a6d9335318..a9c1d827f9 100644
--- a/src/core/SkString.cpp
+++ b/src/core/SkString.cpp
@@ -178,18 +178,18 @@ const SkString::Rec SkString::gEmptyRec(0, 0);
static uint32_t trim_size_t_to_u32(size_t value) {
if (sizeof(size_t) > sizeof(uint32_t)) {
- if (value > SK_MaxU32) {
- value = SK_MaxU32;
+ if (value > UINT32_MAX) {
+ value = UINT32_MAX;
}
}
return (uint32_t)value;
}
static size_t check_add32(size_t base, size_t extra) {
- SkASSERT(base <= SK_MaxU32);
+ SkASSERT(base <= UINT32_MAX);
if (sizeof(size_t) > sizeof(uint32_t)) {
- if (base + extra > SK_MaxU32) {
- extra = SK_MaxU32 - base;
+ if (base + extra > UINT32_MAX) {
+ extra = UINT32_MAX - base;
}
}
return extra;