diff options
| author | Bo Yang <teboring@google.com> | 2017-06-23 12:56:44 -0700 |
|---|---|---|
| committer | Bo Yang <paulyang1211@gmail.com> | 2017-06-24 11:28:13 -0700 |
| commit | e3c807d4e752b477b707f5d021264faf9b127304 (patch) | |
| tree | 505092dff769b14d6a07be62314bc948b9398090 /src/google/protobuf/unknown_field_set.h | |
| parent | 9c0b35cf620c4904a18e25733f50c9c0474fefa6 (diff) | |
| download | protobuf-e3c807d4e752b477b707f5d021264faf9b127304.tar.gz protobuf-e3c807d4e752b477b707f5d021264faf9b127304.tar.bz2 protobuf-e3c807d4e752b477b707f5d021264faf9b127304.zip | |
Fix more implicit type conversions in public headers and generated code.
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 002ea8e8..beb4c9ec 100644 --- a/src/google/protobuf/unknown_field_set.h +++ b/src/google/protobuf/unknown_field_set.h @@ -282,10 +282,10 @@ inline int UnknownFieldSet::field_count() const { } inline const UnknownField& UnknownFieldSet::field(int index) const { GOOGLE_DCHECK(fields_ != NULL); - return (*fields_)[index]; + return (*fields_)[static_cast<size_t>(index)]; } inline UnknownField* UnknownFieldSet::mutable_field(int index) { - return &(*fields_)[index]; + return &(*fields_)[static_cast<size_t>(index)]; } inline void UnknownFieldSet::AddLengthDelimited( @@ -296,7 +296,7 @@ inline void UnknownFieldSet::AddLengthDelimited( -inline int UnknownField::number() const { return number_; } +inline int UnknownField::number() const { return static_cast<int>(number_); } inline UnknownField::Type UnknownField::type() const { return static_cast<Type>(type_); } |