summaryrefslogtreecommitdiffstats
path: root/media/cast/logging
diff options
context:
space:
mode:
authorpkasting <pkasting@chromium.org>2014-10-21 16:53:15 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-21 23:54:44 +0000
commit6b3ea7317ee67859ec3b9e0d10e4ecd89440f16e (patch)
tree41aae955c4992f6291e16275b011a0f669017c25 /media/cast/logging
parentdf7e44a77c954eacf31c9388b0b1edb86811c963 (diff)
downloadchromium_src-6b3ea7317ee67859ec3b9e0d10e4ecd89440f16e.zip
chromium_src-6b3ea7317ee67859ec3b9e0d10e4ecd89440f16e.tar.gz
chromium_src-6b3ea7317ee67859ec3b9e0d10e4ecd89440f16e.tar.bz2
Type conversion fixes, media/ edition.
This is mostly to fix MSVC warnings about possible value truncation. BUG=81439 TEST=none Review URL: https://codereview.chromium.org/638123004 Cr-Commit-Position: refs/heads/master@{#300571}
Diffstat (limited to 'media/cast/logging')
-rw-r--r--media/cast/logging/log_serializer.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/media/cast/logging/log_serializer.cc b/media/cast/logging/log_serializer.cc
index afcf770..c5cb252 100644
--- a/media/cast/logging/log_serializer.cc
+++ b/media/cast/logging/log_serializer.cc
@@ -47,7 +47,7 @@ bool DoSerializeEvents(const LogMetadata& metadata,
int proto_size = metadata.ByteSize();
DCHECK(proto_size <= kMaxSerializedProtoBytes);
- if (!writer.WriteU16(proto_size))
+ if (!writer.WriteU16(static_cast<uint16>(proto_size)))
return false;
if (!metadata.SerializeToArray(writer.ptr(), writer.remaining()))
return false;
@@ -73,7 +73,7 @@ bool DoSerializeEvents(const LogMetadata& metadata,
DCHECK(proto_size <= kMaxSerializedProtoBytes);
// Write size of the proto, then write the proto.
- if (!writer.WriteU16(proto_size))
+ if (!writer.WriteU16(static_cast<uint16>(proto_size)))
return false;
if (!frame_event.SerializeToArray(writer.ptr(), writer.remaining()))
return false;
@@ -97,7 +97,7 @@ bool DoSerializeEvents(const LogMetadata& metadata,
DCHECK(proto_size <= kMaxSerializedProtoBytes);
// Write size of the proto, then write the proto.
- if (!writer.WriteU16(proto_size))
+ if (!writer.WriteU16(static_cast<uint16>(proto_size)))
return false;
if (!packet_event.SerializeToArray(writer.ptr(), writer.remaining()))
return false;