diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2014-10-03 11:13:58 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-10-03 11:14:13 -0700 |
| commit | 84731a111f45e5d11d0d11fe4b53c1818d936df1 (patch) | |
| tree | b2c7d17b117fe423774ff3a5f755ef6d1ab7903f /src/google/protobuf/unknown_field_set.h | |
| parent | 0dd3fef8431591637459f330db61e8c1485495a3 (diff) | |
| download | protobuf-84731a111f45e5d11d0d11fe4b53c1818d936df1.tar.gz protobuf-84731a111f45e5d11d0d11fe4b53c1818d936df1.tar.bz2 protobuf-84731a111f45e5d11d0d11fe4b53c1818d936df1.zip | |
Down-integrate from internal branch.
Diffstat (limited to 'src/google/protobuf/unknown_field_set.h')
| -rw-r--r-- | src/google/protobuf/unknown_field_set.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/unknown_field_set.h b/src/google/protobuf/unknown_field_set.h index 108a0e12..ba202eb6 100644 --- a/src/google/protobuf/unknown_field_set.h +++ b/src/google/protobuf/unknown_field_set.h @@ -138,7 +138,7 @@ class LIBPROTOBUF_EXPORT UnknownFieldSet { bool ParseFromZeroCopyStream(io::ZeroCopyInputStream* input); bool ParseFromArray(const void* data, int size); inline bool ParseFromString(const string& data) { - return ParseFromArray(data.data(), data.size()); + return ParseFromArray(data.data(), static_cast<int>(data.size())); } private: @@ -236,7 +236,7 @@ inline void UnknownFieldSet::Swap(UnknownFieldSet* x) { } inline int UnknownFieldSet::field_count() const { - return (fields_ == NULL) ? 0 : fields_->size(); + return (fields_ == NULL) ? 0 : static_cast<int>(fields_->size()); } inline const UnknownField& UnknownFieldSet::field(int index) const { return (*fields_)[index]; @@ -304,7 +304,7 @@ inline UnknownFieldSet* UnknownField::mutable_group() { inline int UnknownField::GetLengthDelimitedSize() const { GOOGLE_DCHECK_EQ(TYPE_LENGTH_DELIMITED, type()); - return length_delimited_.string_value_->size(); + return static_cast<int>(length_delimited_.string_value_->size()); } inline void UnknownField::SetType(Type type) { |