Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1041)

Unified Diff: src/core/SkDebug.cpp

Issue 19786010: Fix some noisy warnings on Windows x64. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/core/SkTypes.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkDebug.cpp
===================================================================
--- src/core/SkDebug.cpp (revision 10215)
+++ src/core/SkDebug.cpp (working copy)
@@ -11,38 +11,32 @@
#ifdef SK_DEBUG
-int8_t SkToS8(long x)
-{
+int8_t SkToS8(intmax_t x) {
SkASSERT((int8_t)x == x);
return (int8_t)x;
}
-uint8_t SkToU8(size_t x)
-{
+uint8_t SkToU8(uintmax_t x) {
SkASSERT((uint8_t)x == x);
return (uint8_t)x;
}
-int16_t SkToS16(long x)
-{
+int16_t SkToS16(intmax_t x) {
SkASSERT((int16_t)x == x);
return (int16_t)x;
}
-uint16_t SkToU16(size_t x)
-{
+uint16_t SkToU16(uintmax_t x) {
SkASSERT((uint16_t)x == x);
return (uint16_t)x;
}
-int32_t SkToS32(long x)
-{
+int32_t SkToS32(intmax_t x) {
SkASSERT((int32_t)x == x);
return (int32_t)x;
}
-uint32_t SkToU32(size_t x)
-{
+uint32_t SkToU32(uintmax_t x) {
SkASSERT((uint32_t)x == x);
return (uint32_t)x;
}
« no previous file with comments | « include/core/SkTypes.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698