Index: net/spdy/core/spdy_frame_builder.cc |
diff --git a/net/spdy/core/spdy_frame_builder.cc b/net/spdy/core/spdy_frame_builder.cc |
index aa46ddfc1a73e372b0c3e2280930b066b7d9887c..b0d93e3b83b8e32ba054028d31cdb086a0a162d0 100644 |
--- a/net/spdy/core/spdy_frame_builder.cc |
+++ b/net/spdy/core/spdy_frame_builder.cc |
@@ -27,8 +27,7 @@ SpdyFrameBuilder::SpdyFrameBuilder(size_t size, ZeroCopyOutputBuffer* output) |
length_(0), |
offset_(0) {} |
-SpdyFrameBuilder::~SpdyFrameBuilder() { |
-} |
+SpdyFrameBuilder::~SpdyFrameBuilder() {} |
char* SpdyFrameBuilder::GetWritableBuffer(size_t length) { |
if (!CanWrite(length)) { |
@@ -46,7 +45,7 @@ char* SpdyFrameBuilder::GetWritableOutput(size_t length, |
return nullptr; |
} |
output_->Next(&dest, &size); |
- *actual_length = std::min(length, (size_t)size); |
+ *actual_length = std::min<size_t>(length, size); |
return dest; |
} |