diff options
Diffstat (limited to 'src/google/protobuf/io/zero_copy_stream_impl.cc')
| -rw-r--r-- | src/google/protobuf/io/zero_copy_stream_impl.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/google/protobuf/io/zero_copy_stream_impl.cc b/src/google/protobuf/io/zero_copy_stream_impl.cc index f7901b2..1384c74 100644 --- a/src/google/protobuf/io/zero_copy_stream_impl.cc +++ b/src/google/protobuf/io/zero_copy_stream_impl.cc @@ -1,6 +1,6 @@ // Protocol Buffers - Google's data interchange format // Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ +// http://code.google.com/p/protobuf/ // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -46,8 +46,7 @@ #include <google/protobuf/io/zero_copy_stream_impl.h> #include <google/protobuf/stubs/common.h> -#include <google/protobuf/stubs/stl_util.h> - +#include <google/protobuf/stubs/stl_util-inl.h> namespace google { namespace protobuf { @@ -413,9 +412,7 @@ int64 ConcatenatingInputStream::ByteCount() const { LimitingInputStream::LimitingInputStream(ZeroCopyInputStream* input, int64 limit) - : input_(input), limit_(limit) { - prior_bytes_read_ = input_->ByteCount(); -} + : input_(input), limit_(limit) {} LimitingInputStream::~LimitingInputStream() { // If we overshot the limit, back up. @@ -459,9 +456,9 @@ bool LimitingInputStream::Skip(int count) { int64 LimitingInputStream::ByteCount() const { if (limit_ < 0) { - return input_->ByteCount() + limit_ - prior_bytes_read_; + return input_->ByteCount() + limit_; } else { - return input_->ByteCount() - prior_bytes_read_; + return input_->ByteCount(); } } |